Skip to content

Commit 9e2bdae

Browse files
authored
fix(IDX): add public-hotfix branch logic (#9249)
We want the same logic to be applied to `public-hotfix-*` branches.
1 parent 02a5b22 commit 9e2bdae

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

.github/workflows/ci-main.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ jobs:
8282
8383
# List of "protected" branches, i.e. branches (not necessarily "protected" in the GitHub sense) where we need
8484
# the full build to occur (including versioning)
85-
protected_branches=("^master$" "^rc--" "^hotfix-" "^master-private$")
85+
protected_branches=("^master$" "^rc--" "^hotfix-" "^public-hotfix-" "^master-private$")
8686
for pattern in "${protected_branches[@]}"; do
8787
if [[ "$BRANCH_NAME" =~ $pattern ]]; then
8888
is_protected_branch="true"
@@ -203,7 +203,7 @@ jobs:
203203
)
204204
if [[ "$CI_EVENT_NAME" == 'merge_group' ]]; then
205205
bazel_args+=( --test_timeout_filters=short,moderate --flaky_test_attempts=3 )
206-
elif [[ $BRANCH_NAME =~ ^hotfix-.* ]]; then
206+
elif [[ $BRANCH_NAME =~ ^(hotfix-|public-hotfix-) ]]; then
207207
bazel_args+=( --test_timeout_filters=short,moderate )
208208
else
209209
bazel_args+=( --keep_going )
@@ -686,7 +686,8 @@ jobs:
686686
contains(github.event.pull_request.labels.*.name, 'CI_RUN_CARGO_JOBS') ||
687687
env.BRANCH_NAME == 'master' ||
688688
startsWith(env.BRANCH_NAME, 'rc--') ||
689-
startsWith(env.BRANCH_NAME, 'hotfix-')
689+
startsWith(env.BRANCH_NAME, 'hotfix-') ||
690+
startsWith(env.BRANCH_NAME, 'public-hotfix-')
690691
shell: bash
691692
run: |
692693
set -eExuo pipefail
@@ -748,6 +749,7 @@ jobs:
748749
steps.filter.outputs.container-run == 'true' ||
749750
env.BRANCH_NAME == 'master' ||
750751
startsWith(env.BRANCH_NAME, 'rc--') ||
751-
startsWith(env.BRANCH_NAME, 'hotfix-')
752+
startsWith(env.BRANCH_NAME, 'hotfix-') ||
753+
startsWith(env.BRANCH_NAME, 'public-hotfix-')
752754
run: |
753755
./ci/container/container-run.sh ${{ matrix.command }}

0 commit comments

Comments
 (0)