|
82 | 82 |
|
83 | 83 | # List of "protected" branches, i.e. branches (not necessarily "protected" in the GitHub sense) where we need |
84 | 84 | # 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$") |
86 | 86 | for pattern in "${protected_branches[@]}"; do |
87 | 87 | if [[ "$BRANCH_NAME" =~ $pattern ]]; then |
88 | 88 | is_protected_branch="true" |
@@ -203,7 +203,7 @@ jobs: |
203 | 203 | ) |
204 | 204 | if [[ "$CI_EVENT_NAME" == 'merge_group' ]]; then |
205 | 205 | 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 |
207 | 207 | bazel_args+=( --test_timeout_filters=short,moderate ) |
208 | 208 | else |
209 | 209 | bazel_args+=( --keep_going ) |
@@ -686,7 +686,8 @@ jobs: |
686 | 686 | contains(github.event.pull_request.labels.*.name, 'CI_RUN_CARGO_JOBS') || |
687 | 687 | env.BRANCH_NAME == 'master' || |
688 | 688 | startsWith(env.BRANCH_NAME, 'rc--') || |
689 | | - startsWith(env.BRANCH_NAME, 'hotfix-') |
| 689 | + startsWith(env.BRANCH_NAME, 'hotfix-') || |
| 690 | + startsWith(env.BRANCH_NAME, 'public-hotfix-') |
690 | 691 | shell: bash |
691 | 692 | run: | |
692 | 693 | set -eExuo pipefail |
@@ -748,6 +749,7 @@ jobs: |
748 | 749 | steps.filter.outputs.container-run == 'true' || |
749 | 750 | env.BRANCH_NAME == 'master' || |
750 | 751 | startsWith(env.BRANCH_NAME, 'rc--') || |
751 | | - startsWith(env.BRANCH_NAME, 'hotfix-') |
| 752 | + startsWith(env.BRANCH_NAME, 'hotfix-') || |
| 753 | + startsWith(env.BRANCH_NAME, 'public-hotfix-') |
752 | 754 | run: | |
753 | 755 | ./ci/container/container-run.sh ${{ matrix.command }} |
0 commit comments