T1.32e: the route tests' step on one line again; prepush self-tests on ci.yml changes

Round 3's subagent review of 0137286 (P1): selftest.py edits a copy of
ci.yml at the exact line `        run: python -m pytest contract/tests -q`,
which the step's multi-line `run: |` had removed, so CI's L0 self-tests
failed. The step is one line again, with the same options:
`-n auto --dist loadfile --timeout=600 --max-worker-restart=0`.
selftest.py: 497 of 497 as expected.

P3: prepush.sh's cheap tier now also runs the tooling self-tests when
.github/workflows/ci.yml changed, since they read it; its comment and skip
line say so.

Signed-off-by: Adi Wadaskar <awadaskar@nvidia.com>

Author: adi-kumo

.github/workflows/ci.yml

@@ -663,9 +663,7 @@ jobs:
       # with its stack, and a worker that dies ends the run rather than
       # leaving xdist waiting on it.
       - name: The runner's controls and the route tests
-        run: |
-          python -m pytest contract/tests -q -n auto --dist loadfile \
-            --timeout=600 --max-worker-restart=0
+        run: python -m pytest contract/tests -q -n auto --dist loadfile --timeout=600 --max-worker-restart=0
       # As in rust-test, whether the gate runs fails closed (T1.18); off
       # the phase branch, the candidate's own runners and comparator run.
       # Every cell gates, the floor's too (T1.18's own run alone reported

scripts/rust_core/prepush.sh

@@ -23,7 +23,8 @@
 #   prune_caches.py.
 #
 # The cheap tier skips those four self-tests only when no file under
-# scripts/rust_core/ differs between the merge base with the phase branch
+# scripts/rust_core/, nor .github/workflows/ci.yml, which they read, differs
+# between the merge base with the phase branch
 # (origin/rust-core-phase-1, else rust-core-phase-1) and the worktree,
 # committed, uncommitted or untracked, nor, under the hook, between each ref
 # pushed and its own merge base; any change there runs all four, since the
@@ -182,10 +183,11 @@ if [ -n "$base" ] && [ "$pushed_refs" = 1 ]; then
   done <"$logdir/pushed-refs"
 fi
 # The tooling self-tests run unless there is a merge base, the tier is
-# cheap and nothing under scripts/rust_core/ changed.
+# cheap and nothing under scripts/rust_core/ changed, nor CI's workflow,
+# which the self-tests read.
 run_selftests=1
 if [ "$full" = 0 ] && [ -n "$base" ] &&
-  ! grep -q '^scripts/rust_core/' <<<"$changed"; then
+  ! grep -qE '^(scripts/rust_core/|\.github/workflows/ci\.yml$)' <<<"$changed"; then
   run_selftests=0
 fi
 skipped=()
@@ -225,7 +227,7 @@ selftest 'replay_jobs.py self-tests' \
 selftest 'prune_caches.py self-tests' \
   "${py[@]}" scripts/rust_core/prune_caches.py --selftest
 if [ "${#skipped[@]}" -gt 0 ]; then
-  echo "skipped, nothing under scripts/rust_core/ changed since the merge base ${base:0:10} with $phase_ref:" \
+  echo "skipped, nothing under scripts/rust_core/ nor ci.yml changed since the merge base ${base:0:10} with $phase_ref:" \
     "$(IFS=,; echo "${skipped[*]}" | sed 's/,/, /g')"
 fi