[Tool] Init branch-3.4

StarRocks · Nov 20, 2024 · c5c8fc2 · c5c8fc2
1 parent 84c4abd
commit c5c8fc2
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 29 deletions.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -36,8 +36,8 @@ If yes, please specify the type of change:
 
 ## Bugfix cherry-pick branch check:
 - [ ] I have checked the version labels which the pr will be auto-backported to the target branch
+  - [ ] 3.4
   - [ ] 3.3
   - [ ] 3.2
   - [ ] 3.1
-  - [ ] 3.0
-  - [ ] 2.5
+  - [ ] 3.0
diff --git a/.github/workflows/ci-merged.yml b/.github/workflows/ci-merged.yml
@@ -23,14 +23,27 @@ jobs:
       github.repository == 'StarRocks/starrocks' &&
       !contains(github.event.pull_request.title, 'cherry-pick') &&
       !contains(github.event.pull_request.title, 'backport') && (
+      contains(github.event.pull_request.labels.*.name, '3.4') ||
       contains(github.event.pull_request.labels.*.name, '3.3') ||
       contains(github.event.pull_request.labels.*.name, '3.2') ||
       contains(github.event.pull_request.labels.*.name, '3.1') ||
-      contains(github.event.pull_request.labels.*.name, '3.0') ||
-      contains(github.event.pull_request.labels.*.name, '2.5') )
+      contains(github.event.pull_request.labels.*.name, '3.0') )
     env:
       PR_NUMBER: ${{ github.event.number }}
     steps:
+      - name: backport branch-3.4
+        if: contains(github.event.pull_request.labels.*.name, '3.4')
+        uses: thollander/actions-comment-pull-request@v2
+        with:
+          message: |
+            @Mergifyio backport branch-3.4
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - uses: actions-ecosystem/action-remove-labels@v1
+        if: contains(github.event.pull_request.labels.*.name, '3.4')
+        with:
+          labels: '3.4'
+
       - name: backport branch-3.3
         if: contains(github.event.pull_request.labels.*.name, '3.3')
         uses: thollander/actions-comment-pull-request@v2
@@ -83,19 +96,6 @@ jobs:
         with:
           labels: '3.0'
 
-      - name: backport branch-2.5
-        if: contains(github.event.pull_request.labels.*.name, '2.5')
-        uses: thollander/actions-comment-pull-request@v2
-        with:
-          message: |
-            @Mergifyio backport branch-2.5
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - uses: actions-ecosystem/action-remove-labels@v1
-        if: contains(github.event.pull_request.labels.*.name, '2.5')
-        with:
-          labels: '2.5'
-
   thirdparty-update-image:
     runs-on: [self-hosted, normal]
     name: Thirdparty Update Image

diff --git a/.github/workflows/inspection-pipeline.yml b/.github/workflows/inspection-pipeline.yml
@@ -92,12 +92,12 @@ jobs:
           BE_UT_LINUX=ubuntu
           if [[ "${{ github.event_name }}" == "schedule" ]]; then
             if [[ "${{ github.event.schedule }}" == "0 11 * * 1,3,5" ]]; then
-              branch=branch-3.3
+              branch=branch-3.4
               if [[ "$GITHUB_REPOSITORY" == 'StarRocks/starrocks' && `date +%u` -eq 1 ]]; then
                 all_linux=true
               fi
             elif [[ "${{ github.event.schedule }}" == "0 11 * * 2,4" ]]; then
-              branch=branch-3.2
+              branch=branch-3.3
               all_linux=false
             elif [[ "${{ github.event.schedule }}" == "0 0 * * 1-5" ]]; then
               branch=main

diff --git a/.github/workflows/pr-checker.yml b/.github/workflows/pr-checker.yml
@@ -128,6 +128,12 @@ jobs:
       !contains(github.event.pull_request.title, 'cherry-pick') &&
       !contains(github.event.pull_request.title, 'backport')
     steps:
+      - name: add branch-3.4 label
+        if: contains(toJson(github.event.pull_request.body), '[x] 3.4')
+        uses: actions-ecosystem/action-add-labels@v1
+        with:
+          labels: '3.4'
+
       - name: add branch-3.3 label
         if: contains(toJson(github.event.pull_request.body), '[x] 3.3')
         uses: actions-ecosystem/action-add-labels@v1
@@ -152,11 +158,11 @@ jobs:
         with:
           labels: '3.0'
 
-      - name: add branch-2.5 label
-        if: contains(toJson(github.event.pull_request.body), '[x] 2.5')
-        uses: actions-ecosystem/action-add-labels@v1
+      - name: remove branch-3.4 label
+        if: contains(toJson(github.event.pull_request.body), '[ ] 3.4') && contains(github.event.pull_request.labels.*.name, '3.4')
+        uses: actions-ecosystem/action-remove-labels@v1
         with:
-          labels: '2.5'
+          labels: '3.4'
 
       - name: remove branch-3.3 label
         if: contains(toJson(github.event.pull_request.body), '[ ] 3.3') && contains(github.event.pull_request.labels.*.name, '3.3')
@@ -182,12 +188,6 @@ jobs:
         with:
           labels: '3.0'
 
-      - name: remove branch-2.5 label
-        if: contains(toJson(github.event.pull_request.body), '[ ] 2.5') && contains(github.event.pull_request.labels.*.name, '2.5')
-        uses: actions-ecosystem/action-remove-labels@v1
-        with:
-          labels: '2.5'
-
       - name: check-done
         if: >
           (startsWith(github.event.pull_request.title, '[BugFix]') ||