Skip to content

Commit e744645

Browse files
committed
ci: skip tidy in PR CI jobs not dedicated to running tidy
This is both: 1. Redundant, since PR CI has a dedicated `tidy` job 2. A contributor roadblock, because tidy failures block further failures from being revealed. We *only* skip tidy in PR CI and not in Merge CI because tidy in Merge CI will early-cancel *anyway*.
1 parent e0cb264 commit e744645

2 files changed

Lines changed: 20 additions & 0 deletions

File tree

src/ci/docker/scripts/stage_2_test_set1.sh

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,16 @@ set -ex
44

55
# Run a subset of tests. Used to run tests in parallel in multiple jobs.
66

7+
# When this job partition is run as part of PR CI, skip tidy to allow revealing more failures. The
8+
# dedicated `tidy` job failing won't block other PR CI jobs from completing, and so tidy failures
9+
# shouldn't inhibit revealing other failures in PR CI jobs.
10+
if [[ -z "${PR_CI_JOB}" ]]; then
11+
SKIP_TIDY="--skip tidy"
12+
else
13+
SKIP_TIDY=""
14+
fi
15+
716
../x.py --stage 2 test \
17+
"$SKIP_TIDY" \
818
--skip compiler \
919
--skip src

src/ci/docker/scripts/stage_2_test_set2.sh

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,17 @@ set -ex
44

55
# Run a subset of tests. Used to run tests in parallel in multiple jobs.
66

7+
# When this job partition is run as part of PR CI, skip tidy to allow revealing more failures. The
8+
# dedicated `tidy` job failing won't block other PR CI jobs from completing, and so tidy failures
9+
# shouldn't inhibit revealing other failures in PR CI jobs.
10+
if [[ -z "${PR_CI_JOB}" ]]; then
11+
SKIP_TIDY="--skip tidy"
12+
else
13+
SKIP_TIDY=""
14+
fi
15+
716
../x.py --stage 2 test \
17+
"$SKIP_TIDY" \
818
--skip tests \
919
--skip coverage-map \
1020
--skip coverage-run \

0 commit comments

Comments
 (0)