Merge branch 'master' into fix-master-0812

apache · Aug 18, 2024 · ce12b8e · ce12b8e
2 parents 7952d9e + ff892b3
commit ce12b8e
Show file tree

Hide file tree

Showing 615 changed files with 14,668 additions and 4,428 deletions.
diff --git a/.asf.yaml b/.asf.yaml
@@ -72,33 +72,6 @@ github:
         dismiss_stale_reviews: true
         require_code_owner_reviews: true
         required_approving_review_count: 1
-
-    branch-3.0:
-      required_status_checks:
-        # if strict is true, means "Require branches to be up to date before merging".
-        strict: false
-        contexts:
-          - License Check
-          - Clang Formatter
-          - CheckStyle
-          - Build Broker
-          - ShellCheck
-          - Build Third Party Libraries (Linux)
-          - Build Third Party Libraries (macOS)
-          - Build Third Party Libraries (macOS-arm64)
-          - FE UT (Doris FE UT)
-          - BE UT (Doris BE UT)
-          - Cloud UT (Doris Cloud UT)
-          - COMPILE (DORIS_COMPILE)
-          - P0 Regression (Doris Regression)
-          - P1 Regression (Doris Regression)
-          - External Regression (Doris External Regression)
-          - cloud_p1 (Doris Cloud Regression)
-          - cloud_p0 (Doris Cloud Regression)
-      required_pull_request_reviews:
-        dismiss_stale_reviews: true
-        required_approving_review_count: 1
-
     branch-1.1-lts:
       required_status_checks:
         # if strict is true, means "Require branches to be up to date before merging".

diff --git a/.github/workflows/comment-to-trigger-teamcity.yml b/.github/workflows/comment-to-trigger-teamcity.yml
@@ -25,11 +25,12 @@ jobs:
   check-comment-if-need-to-trigger-teamcity:
 
     # This job only runs for pull request comments, and comment body contains 'run'
-    if: ${{ github.event.issue.pull_request && contains(github.event.comment.body, 'run') }}
+    if: ${{ github.event.issue.pull_request && (contains(github.event.comment.body, 'run') || contains(github.event.comment.body, 'skip buildall')) }}
 
     runs-on: ubuntu-latest
     env:
       COMMENT_BODY: ${{ github.event.comment.body }}
+      COMMENT_USER_ID: ${{ github.event.comment.user.id }}
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
     steps:
@@ -50,8 +51,20 @@ jobs:
             "${COMMENT_BODY}" == *'run arm'* ||
             "${COMMENT_BODY}" == *'run performance'* ]]; then
             echo "comment_trigger=true" | tee -a "$GITHUB_OUTPUT"
+            echo "comment_skip=false" | tee -a "$GITHUB_OUTPUT"
+        elif [[ "${COMMENT_BODY}" == *'skip buildall'* ]]; then
+            if [[ "${COMMENT_USER_ID}" == '27881198' ||
+                  "${COMMENT_USER_ID}" == '37901441' ]]; then
+                echo "comment_trigger=false" | tee -a "$GITHUB_OUTPUT"
+                echo "comment_skip=true" | tee -a "$GITHUB_OUTPUT"
+                echo "COMMENT_USER_ID ${COMMENT_USER_ID} is allowed to skip buildall."
+            else
+                echo "COMMENT_USER_ID ${COMMENT_USER_ID} is not allowed to skip buildall."
+                exit
+            fi
         else
             echo "comment_trigger=false" | tee -a "$GITHUB_OUTPUT"
+            echo "comment_skip=false" | tee -a "$GITHUB_OUTPUT"
             echo "find no keyword in comment body, skip this action."
             exit
         fi
@@ -71,7 +84,7 @@ jobs:
         echo "COMMENT_REPEAT_TIMES=${COMMENT_REPEAT_TIMES}" | tee -a "$GITHUB_OUTPUT"
 
     - name: "Checkout master"
-      if: ${{ fromJSON(steps.parse.outputs.comment_trigger) }}
+      if: ${{ fromJSON(steps.parse.outputs.comment_trigger) || fromJSON(steps.parse.outputs.comment_skip) }}
       uses: actions/checkout@v4
 
     - name: "Check if pr need run build"
@@ -364,3 +377,19 @@ jobs:
             "performance" \
             "${{ steps.parse.outputs.COMMENT_REPEAT_TIMES }}"
         fi
+
+    - name: "Skip buildall"
+      if: ${{ fromJSON(steps.parse.outputs.comment_skip) }}
+      run: |
+        source ./regression-test/pipeline/common/teamcity-utils.sh
+        skip_build "${{ steps.parse.outputs.COMMIT_ID_FROM_TRIGGER }}" feut
+        skip_build "${{ steps.parse.outputs.COMMIT_ID_FROM_TRIGGER }}" beut
+        skip_build "${{ steps.parse.outputs.COMMIT_ID_FROM_TRIGGER }}" compile
+        skip_build "${{ steps.parse.outputs.COMMIT_ID_FROM_TRIGGER }}" p0
+        skip_build "${{ steps.parse.outputs.COMMIT_ID_FROM_TRIGGER }}" p1
+        skip_build "${{ steps.parse.outputs.COMMIT_ID_FROM_TRIGGER }}" external
+        skip_build "${{ steps.parse.outputs.COMMIT_ID_FROM_TRIGGER }}" performance
+        skip_build "${{ steps.parse.outputs.COMMIT_ID_FROM_TRIGGER }}" arm
+        skip_build "${{ steps.parse.outputs.COMMIT_ID_FROM_TRIGGER }}" cloud_p0
+        skip_build "${{ steps.parse.outputs.COMMIT_ID_FROM_TRIGGER }}" cloud_p1
+        skip_build "${{ steps.parse.outputs.COMMIT_ID_FROM_TRIGGER }}" cloudut
diff --git a/.github/workflows/labeler/scope-label-conf.yml b/.github/workflows/labeler/scope-label-conf.yml
@@ -25,4 +25,6 @@ meta-change:
   - gensrc/proto/*
 
 doing:
-  - '**'
+  - base-branch: 'master'
+  - changed-files:
+    - any-glob-to-any-file: '**'