From 498f1114ec3d01adb425024b2126f02f41bc4eca Mon Sep 17 00:00:00 2001 From: Jieyou Xu Date: Thu, 19 Feb 2026 19:48:57 +0800 Subject: [PATCH] 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*. --- src/ci/docker/scripts/stage_2_test_set1.sh | 9 +++++++++ src/ci/docker/scripts/stage_2_test_set2.sh | 9 +++++++++ 2 files changed, 18 insertions(+) diff --git a/src/ci/docker/scripts/stage_2_test_set1.sh b/src/ci/docker/scripts/stage_2_test_set1.sh index 3baff4b52215a..ce33c6d72d673 100755 --- a/src/ci/docker/scripts/stage_2_test_set1.sh +++ b/src/ci/docker/scripts/stage_2_test_set1.sh @@ -4,6 +4,15 @@ set -ex # Run a subset of tests. Used to run tests in parallel in multiple jobs. +# When this job partition is run as part of PR CI, skip tidy to allow revealing more failures. The +# dedicated `tidy` job failing won't block other PR CI jobs from completing, and so tidy failures +# shouldn't inhibit revealing other failures in PR CI jobs. +if [ "$PR_CI_JOB" == "1" ]; then + echo "PR_CI_JOB set; skipping tidy" + SKIP_TIDY="--skip tidy" +fi + ../x.py --stage 2 test \ + ${SKIP_TIDY:+$SKIP_TIDY} \ --skip compiler \ --skip src diff --git a/src/ci/docker/scripts/stage_2_test_set2.sh b/src/ci/docker/scripts/stage_2_test_set2.sh index 872d758dce381..06b80b200a8c0 100755 --- a/src/ci/docker/scripts/stage_2_test_set2.sh +++ b/src/ci/docker/scripts/stage_2_test_set2.sh @@ -4,7 +4,16 @@ set -ex # Run a subset of tests. Used to run tests in parallel in multiple jobs. +# When this job partition is run as part of PR CI, skip tidy to allow revealing more failures. The +# dedicated `tidy` job failing won't block other PR CI jobs from completing, and so tidy failures +# shouldn't inhibit revealing other failures in PR CI jobs. +if [ "$PR_CI_JOB" == "1" ]; then + echo "PR_CI_JOB set; skipping tidy" + SKIP_TIDY="--skip tidy" +fi + ../x.py --stage 2 test \ + ${SKIP_TIDY:+$SKIP_TIDY} \ --skip tests \ --skip coverage-map \ --skip coverage-run \