bugfix: githubCI相关文件 #238

TencentBlueKing · Jan 10, 2025 · 7337f89 · 7337f89
1 parent d109b45
commit 7337f89
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 19 deletions.
diff --git 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
@@ -13,7 +13,7 @@ jobs:
       - name: Build and publish to pypi
         uses: JRubics/[email protected]
         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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/[email protected]

diff --git 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: