From 7337f894d6ff92fc65f5c8b710f946ac163713ca Mon Sep 17 00:00:00 2001 From: arthurhuang Date: Fri, 10 Jan 2025 15:37:21 +0800 Subject: [PATCH] =?UTF-8?q?bugfix:=20githubCI=E7=9B=B8=E5=85=B3=E6=96=87?= =?UTF-8?q?=E4=BB=B6=20#238?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/engine_flake8_and_black.yml | 2 +- .github/workflows/engine_python_package_poetry.yml | 2 +- .github/workflows/engine_unittest.yml | 2 +- .github/workflows/pipeline_end_to_end_test.yml | 4 ++-- .github/workflows/pr_check.yml | 14 +++++++------- .../workflows/runtime_pipeline_end_to_end_test.yml | 4 ++-- .../runtime_pipeline_flake8_and_black.yml | 2 +- .../runtime_pipeline_python_package_poetry.yml | 4 ++-- .github/workflows/runtime_pipeline_unittest.yml | 4 ++-- 9 files changed, 19 insertions(+), 19 deletions(-) diff --git a/.github/workflows/engine_flake8_and_black.yml b/.github/workflows/engine_flake8_and_black.yml index 8edf29e6..7c9df77b 100644 --- a/.github/workflows/engine_flake8_and_black.yml +++ b/.github/workflows/engine_flake8_and_black.yml @@ -10,7 +10,7 @@ jobs: strategy: matrix: - python-version: [3.6, 3.7] + python-version: [3.11] steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/engine_python_package_poetry.yml b/.github/workflows/engine_python_package_poetry.yml index a540c954..bac006d1 100644 --- a/.github/workflows/engine_python_package_poetry.yml +++ b/.github/workflows/engine_python_package_poetry.yml @@ -13,7 +13,7 @@ jobs: - name: Build and publish to pypi uses: JRubics/poetry-publish@v1.13 with: - python_version: "3.7" + python_version: "3.11" poetry_version: "==1.2.1" ignore_dev_requirements: "yes" repository_name: "bamboo-engine" diff --git a/.github/workflows/engine_unittest.yml b/.github/workflows/engine_unittest.yml index b9111181..400c2efc 100644 --- a/.github/workflows/engine_unittest.yml +++ b/.github/workflows/engine_unittest.yml @@ -10,7 +10,7 @@ jobs: strategy: matrix: - python-version: [3.6, 3.7] + python-version: [3.11] steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/pipeline_end_to_end_test.yml b/.github/workflows/pipeline_end_to_end_test.yml index ccf5c85b..625561d4 100644 --- a/.github/workflows/pipeline_end_to_end_test.yml +++ b/.github/workflows/pipeline_end_to_end_test.yml @@ -13,8 +13,8 @@ jobs: DB_PASSWORD: root strategy: matrix: - python-version: [3.6, 3.7] - django-version: [2.2, 3.0] + python-version: [3.11] + django-version: [4.2] steps: diff --git a/.github/workflows/pr_check.yml b/.github/workflows/pr_check.yml index 40139e1e..47acc768 100644 --- a/.github/workflows/pr_check.yml +++ b/.github/workflows/pr_check.yml @@ -2,27 +2,27 @@ name: PR check on: pull_request: - branches: [master, develop] + branches: [master, develop, python_upgrade_master] jobs: engine-lint: - uses: TencentBlueKing/bamboo-engine/.github/workflows/engine_flake8_and_black.yml@master + uses: TencentBlueKing/bamboo-engine/.github/workflows/engine_flake8_and_black.yml@python_upgrade_master pipeline-lint: - uses: TencentBlueKing/bamboo-engine/.github/workflows/runtime_pipeline_flake8_and_black.yml@master + uses: TencentBlueKing/bamboo-engine/.github/workflows/runtime_pipeline_flake8_and_black.yml@python_upgrade_master engine-unittest: needs: engine-lint - uses: TencentBlueKing/bamboo-engine/.github/workflows/engine_unittest.yml@master + uses: TencentBlueKing/bamboo-engine/.github/workflows/engine_unittest.yml@python_upgrade_master pipeline-unittest: needs: pipeline-lint - uses: TencentBlueKing/bamboo-engine/.github/workflows/runtime_pipeline_unittest.yml@master + uses: TencentBlueKing/bamboo-engine/.github/workflows/runtime_pipeline_unittest.yml@python_upgrade_master runtime-pipeline-intergration-test: needs: [engine-unittest, pipeline-unittest] - uses: TencentBlueKing/bamboo-engine/.github/workflows/runtime_pipeline_end_to_end_test.yml@master + uses: TencentBlueKing/bamboo-engine/.github/workflows/runtime_pipeline_end_to_end_test.yml@python_upgrade_master pipeline-intergration-test: needs: pipeline-unittest - uses: TencentBlueKing/bamboo-engine/.github/workflows/pipeline_end_to_end_test.yml@master + uses: TencentBlueKing/bamboo-engine/.github/workflows/pipeline_end_to_end_test.yml@python_upgrade_master diff --git a/.github/workflows/runtime_pipeline_end_to_end_test.yml b/.github/workflows/runtime_pipeline_end_to_end_test.yml index a208e965..517eef18 100644 --- a/.github/workflows/runtime_pipeline_end_to_end_test.yml +++ b/.github/workflows/runtime_pipeline_end_to_end_test.yml @@ -13,8 +13,8 @@ jobs: DB_PASSWORD: root strategy: matrix: - python-version: [3.6, 3.7] - django-version: [2.2, 3.0] + python-version: [3.11] + django-version: [4.2] steps: diff --git a/.github/workflows/runtime_pipeline_flake8_and_black.yml b/.github/workflows/runtime_pipeline_flake8_and_black.yml index 83934e30..b770ad70 100644 --- a/.github/workflows/runtime_pipeline_flake8_and_black.yml +++ b/.github/workflows/runtime_pipeline_flake8_and_black.yml @@ -10,7 +10,7 @@ jobs: strategy: matrix: - python-version: [3.6, 3.7] + python-version: [3.11] steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/runtime_pipeline_python_package_poetry.yml b/.github/workflows/runtime_pipeline_python_package_poetry.yml index ce8b997a..4dcb0c34 100644 --- a/.github/workflows/runtime_pipeline_python_package_poetry.yml +++ b/.github/workflows/runtime_pipeline_python_package_poetry.yml @@ -10,10 +10,10 @@ jobs: runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v2 - - name: Set up Python 3.6 + - name: Set up Python 3.11 uses: actions/setup-python@v2 with: - python-version: 3.7 + python-version: 3.11 - name: Set up Poetry uses: abatilo/actions-poetry@v2.0.0 diff --git a/.github/workflows/runtime_pipeline_unittest.yml b/.github/workflows/runtime_pipeline_unittest.yml index 53707e9d..3903f8d6 100644 --- a/.github/workflows/runtime_pipeline_unittest.yml +++ b/.github/workflows/runtime_pipeline_unittest.yml @@ -13,8 +13,8 @@ jobs: DB_PASSWORD: root strategy: matrix: - python-version: [3.6, 3.7] - django-version: [2.2, 3.0] + python-version: [3.11] + django-version: [4.2] steps: