Merge branch 'main' into enhancement-transaction

Signed-off-by: zhanghe <[email protected]>

.github/CODEOWNERS

@@ -130,4 +130,7 @@
 /be/src/runtime/tablets_channel.cpp     @StarRocks/load-unload-maintainer
 /be/src/runtime/export_sink.cpp         @StarRocks/load-unload-maintainer
 
+# meta upgrade/downgrade compatibility
+/fe/fe-core/src/main/java/com/starrocks/persist/gson/GsonUtils.java @StarRocks/meta-compatibility-maintainer
+
 

.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

.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

.github/workflows/ci-pipeline-branch.yml

@@ -211,6 +211,8 @@ jobs:
     env:
       PR_NUMBER: ${{ github.event.number }}
       BRANCH: ${{ github.base_ref }}
+      IMAGE_CACHE_ID: ${{ needs.thirdparty-info.outputs.ubuntu_image_cache_id }}
+      LINUX_DISTRO: ubuntu
     steps:
       - name: BRANCH INFO
         id: branch
@@ -225,10 +227,10 @@ jobs:
         run: |
           rm -rf ./ci-tool && cp -rf /var/lib/ci-tool ./ci-tool && cd ci-tool && git pull && source lib/init.sh
           if [[ "${{ needs.be-checker.outputs.output2 }}" == 'true' ]]; then
-              export image_cache_id=${{ needs.thirdparty-info.outputs.centos7_image_cache_id }}
+              export image_cache_id=${IMAGE_CACHE_ID}
               export image_tag=$BRANCH-$PR_NUMBER
           fi
-          ./bin/elastic-ut.sh --pr ${PR_NUMBER} --module be --branch ${{ steps.branch.outputs.branch }} --repository ${{ github.repository }}
+          ./bin/elastic-ut.sh --pr ${PR_NUMBER} --module be --branch ${{ steps.branch.outputs.branch }} --repository ${{ github.repository }} --linuxdistro ${LINUX_DISTRO}
 
       - name: clean ECI
         if: always()
@@ -446,7 +448,7 @@ jobs:
         timeout-minutes: 60
         run: |
           rm -rf ./ci-tool && cp -rf /var/lib/ci-tool ./ci-tool && cd ci-tool && git pull && source lib/init.sh
-          ./bin/elastic-ut.sh --pr ${PR_NUMBER} --module fe --branch ${{steps.branch.outputs.branch}} --build Release --repository ${{ github.repository }}
+          ./bin/elastic-ut.sh --pr ${PR_NUMBER} --module fe --branch ${{steps.branch.outputs.branch}} --build Release --repository ${{ github.repository }} --linuxdistro ubuntu
 
       - name: Clean ECI
         if: always()