From 1e5f9fd9da1e875cb1f6ce42a46e571b7b1bfeab Mon Sep 17 00:00:00 2001 From: Matt Solomon Date: Mon, 16 Nov 2026 18:02:38 -0800 Subject: [PATCH 1/2] ci: log missing shard timings, note token context and proposal branches Follow-up to review on #24207: shard-tests.sh logs when the timings dir exists but has no file for the job, so a stale JOBS list shows up in the log. Comments point a future token at a restricted context and note that branches into proposal/* still fetch develop's timings. Co-Authored-By: Claude Opus 5.5 --- .circleci/continue/main.yml | 4 +++- ops/scripts/shard-tests.sh | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.circleci/continue/main.yml b/.circleci/continue/main.yml index 27068f658a6..f0935a246b4 100644 --- a/.circleci/continue/main.yml +++ b/.circleci/continue/main.yml @@ -1720,6 +1720,7 @@ jobs: - matches: pattern: "^gh-readonly-queue/.*$" value: << pipeline.git.branch >> + # Branches into proposal/* still fetch develop's. Tests develop lacks get the 1m default. - matches: pattern: "^proposal/.*$" value: << pipeline.git.branch >> @@ -1727,7 +1728,8 @@ jobs: - run: name: Fetch develop's timings # The API needs no token while the project is public. If it goes private, set - # CIRCLE_TIMINGS_TOKEN (a personal API token, v2 rejects project tokens) as a project env var. + # CIRCLE_TIMINGS_TOKEN (a personal API token, v2 rejects project tokens) in a restricted + # context on this job. A project env var would be readable by every job. environment: # The fork must follow acceptance_l1_forks. A job with no file splits as today. JOBS: memory-all-opn-op-reth-fusaka memory-all-kona-op-reth-fusaka diff --git a/ops/scripts/shard-tests.sh b/ops/scripts/shard-tests.sh index e8d385d2032..8197686cb2b 100755 --- a/ops/scripts/shard-tests.sh +++ b/ops/scripts/shard-tests.sh @@ -42,6 +42,8 @@ set -- if [ -s "$TIMINGS_FILE" ]; then echo "Splitting by develop's timings from $TIMINGS_FILE" >&2 set -- --timings-file "$TIMINGS_FILE" +elif [ -d "$(dirname "$TIMINGS_FILE")" ]; then + echo "No develop timings for ${CIRCLE_JOB:-}, splitting by CircleCI's own" >&2 fi # Canceled runs can leave partial history. CircleCI's tiny default weight for From a0416a66c9a26a3fae012f4d4b6e0cbd045e706c Mon Sep 17 00:00:00 2001 From: Matt Solomon Date: Mon, 16 Nov 2026 18:06:16 -0800 Subject: [PATCH 2/2] ci: neutral wording for the missing-timings log and proposal comment Co-Authored-By: Claude Opus 5.5 --- .circleci/continue/main.yml | 2 +- ops/scripts/shard-tests.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/continue/main.yml b/.circleci/continue/main.yml index f0935a246b4..3504e771de9 100644 --- a/.circleci/continue/main.yml +++ b/.circleci/continue/main.yml @@ -1720,7 +1720,7 @@ jobs: - matches: pattern: "^gh-readonly-queue/.*$" value: << pipeline.git.branch >> - # Branches into proposal/* still fetch develop's. Tests develop lacks get the 1m default. + # PR branches targeting proposal/* still fetch develop's. Tests develop lacks get the 1m default. - matches: pattern: "^proposal/.*$" value: << pipeline.git.branch >> diff --git a/ops/scripts/shard-tests.sh b/ops/scripts/shard-tests.sh index 8197686cb2b..0547c929102 100755 --- a/ops/scripts/shard-tests.sh +++ b/ops/scripts/shard-tests.sh @@ -43,7 +43,7 @@ if [ -s "$TIMINGS_FILE" ]; then echo "Splitting by develop's timings from $TIMINGS_FILE" >&2 set -- --timings-file "$TIMINGS_FILE" elif [ -d "$(dirname "$TIMINGS_FILE")" ]; then - echo "No develop timings for ${CIRCLE_JOB:-}, splitting by CircleCI's own" >&2 + echo "No fetched timings for ${CIRCLE_JOB:-}, splitting by CircleCI's own" >&2 fi # Canceled runs can leave partial history. CircleCI's tiny default weight for