This is an automated email from the ASF dual-hosted git repository.
morningman pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new 86274606d94 [chore](ci) add required check for branch-2.1 (#35910)
86274606d94 is described below
commit 86274606d94395c8f405f0a0b3ac904ced2236d0
Author: Dongyang Li <[email protected]>
AuthorDate: Thu Jun 6 09:58:37 2024 +0800
[chore](ci) add required check for branch-2.1 (#35910)
ref:
https://github.com/apache/infrastructure-asfyaml?tab=readme-ov-file#branchpro
The old way of setting required status was initially normal, but there
was a period when the issue "Required status check 'XXXX' was not set by
the expected GitHub app" occurred.
here use the new way to explicitly set app as -1 (any source).
Co-authored-by: stephen <[email protected]>
---
.asf.yaml | 28 +++++++++++++++++++++++
.github/workflows/comment-to-trigger-teamcity.yml | 22 ++++++++++++++----
2 files changed, 46 insertions(+), 4 deletions(-)
diff --git a/.asf.yaml b/.asf.yaml
index 588406c8dd5..5c46380b3c9 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -81,6 +81,34 @@ github:
dismiss_stale_reviews: true
required_approving_review_count: 1
+ branch-2.1:
+ required_status_checks:
+ # strict 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)
+ checks:
+ - context: COMPILE (DORIS_COMPILE)
+ app_id: -1
+ - context: P0 Regression (Doris Regression)
+ app_id: -1
+ - context: External Regression (Doris External Regression)
+ app_id: -1
+ - context: FE UT (Doris FE UT)
+ app_id: -1
+ - context: BE UT (Doris BE UT)
+ app_id: -1
+
+ required_pull_request_reviews:
+ dismiss_stale_reviews: true
+ required_approving_review_count: 1
+
branch-2.0:
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
index 561597bd57a..bd3e29dbb0c 100644
--- a/.github/workflows/comment-to-trigger-teamcity.yml
+++ b/.github/workflows/comment-to-trigger-teamcity.yml
@@ -149,7 +149,8 @@ jobs:
source ./regression-test/pipeline/common/teamcity-utils.sh
set -x
if [[ "${{ steps.parse.outputs.TARGET_BRANCH }}" == "'master'" ||
- "${{ steps.parse.outputs.TARGET_BRANCH }}" == "'branch-2.0'" ]];
then
+ "${{ steps.parse.outputs.TARGET_BRANCH }}" == "'branch-2.0'" ||
+ "${{ steps.parse.outputs.TARGET_BRANCH }}" == "'branch-2.1'" ]];
then
trigger_or_skip_build \
"${{ steps.changes.outputs.changed_fe_ut }}" \
"${{ steps.parse.outputs.PULL_REQUEST_NUM }}" \
@@ -157,7 +158,13 @@ jobs:
"feut" \
"${{ steps.parse.outputs.COMMENT_REPEAT_TIMES }}"
else
- echo "PR target branch is not in (master, branch-2.0), skip run feut"
+ echo "PR target branch is not in (master, branch-2.0, branch-2.1),
skip run feut"
+ trigger_or_skip_build \
+ "false" \
+ "${{ steps.parse.outputs.PULL_REQUEST_NUM }}" \
+ "${{ steps.parse.outputs.COMMIT_ID_FROM_TRIGGER }}" \
+ "feut" \
+ "${{ steps.parse.outputs.COMMENT_REPEAT_TIMES }}"
fi
@@ -167,7 +174,8 @@ jobs:
source ./regression-test/pipeline/common/teamcity-utils.sh
set -x
if [[ "${{ steps.parse.outputs.TARGET_BRANCH }}" == "'master'" ||
- "${{ steps.parse.outputs.TARGET_BRANCH }}" == "'branch-2.0'" ]];
then
+ "${{ steps.parse.outputs.TARGET_BRANCH }}" == "'branch-2.0'" ||
+ "${{ steps.parse.outputs.TARGET_BRANCH }}" == "'branch-2.1'" ]];
then
trigger_or_skip_build \
"${{ steps.changes.outputs.changed_be_ut }}" \
"${{ steps.parse.outputs.PULL_REQUEST_NUM }}" \
@@ -175,7 +183,13 @@ jobs:
"beut" \
"${{ steps.parse.outputs.COMMENT_REPEAT_TIMES }}"
else
- echo "PR target branch is not in (master, branch-2.0), skip run beut"
+ echo "PR target branch is not in (master, branch-2.0, branch-2.1),
skip run beut"
+ trigger_or_skip_build \
+ "false" \
+ "${{ steps.parse.outputs.PULL_REQUEST_NUM }}" \
+ "${{ steps.parse.outputs.COMMIT_ID_FROM_TRIGGER }}" \
+ "beut" \
+ "${{ steps.parse.outputs.COMMENT_REPEAT_TIMES }}"
fi
- name: "Trigger or Skip cloudut"
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
