From c3c4882ba7bf966ec054574248ba23db43e49a5a Mon Sep 17 00:00:00 2001 From: Cursor Agent Date: Fri, 13 Nov 2026 19:58:31 +0000 Subject: [PATCH] Run the three long checker binaries in their own CI jobs. cargo test runs one binary at a time. On main 9ef5c387, form_bridge, break_fg8_witness and emit_run took about 21 minutes inside tests-fast, which is why that step and the tree-sitter feature suite approached the job limit. Each binary still runs with and without the tree-sitter feature. No test is dropped. Co-authored-by: David Charlot --- .github/workflows/ci.yml | 12 ++++--- .github/workflows/tree-sitter-sync.yml | 43 +++++++++++++++++++++----- scripts/ci-nff.sh | 2 +- scripts/ci-tests.sh | 2 +- 4 files changed, 45 insertions(+), 14 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 434e1897..09cb7243 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -56,10 +56,11 @@ jobs: tests-fast: runs-on: ubuntu-latest - # On 429b1bba both Fast tests steps were cancelled at 45 minutes - # during one_conformance, near the end of the suite. On 84efac9f the - # same step finished in 36 minutes (run 43449003552). 60 minutes - # covers the slow run. No test is dropped. + # form_bridge, break_fg8_witness and emit_run each have a tests-slow + # job. cargo test runs one binary at a time, and on main 9ef5c387 + # (run 42818858124) those three took 519 s, 425 s and 305 s inside + # this step. The step still runs every other binary. No test is + # dropped. 60 minutes remains the limit. timeout-minutes: 60 strategy: fail-fast: false @@ -87,8 +88,11 @@ jobs: matrix: features: [""] bin: + - break_fg8_witness - dst_chat - emit + - emit_run + - form_bridge - framing_rce - fuel - golden_apps diff --git a/.github/workflows/tree-sitter-sync.yml b/.github/workflows/tree-sitter-sync.yml index e27ddec3..e56615cf 100644 --- a/.github/workflows/tree-sitter-sync.yml +++ b/.github/workflows/tree-sitter-sync.yml @@ -9,18 +9,18 @@ on: push: pull_request: -# The whole suite runs in ci.yml; this workflow runs what needs the CLI: -# tree_sitter_sync for each feature set, and the fast tests with the -# tree-sitter feature on (the slow vector suites do not use it). +# ci.yml runs the suite without the tree-sitter feature. This workflow +# runs tree_sitter_sync for each feature set, the fast tests with the +# tree-sitter feature on, and form_bridge, break_fg8_witness and emit_run +# with that feature. The other slow binaries do not use the feature. jobs: checker: runs-on: ubuntu-latest - # Sync and fuzz take about 3 minutes, then this job runs the same - # fast suite. That suite finished in 36 minutes in ci (run - # 43449003552). Run 43449017317 cancelled it at 45 minutes during - # one_conformance, near the end. 60 minutes is that measured time. - # No test is dropped. + # Sync and fuzz, then the fast suite with the tree-sitter feature. + # form_bridge, break_fg8_witness and emit_run are the slow job + # below, so they are not in that suite. No test is dropped. + # 60 minutes remains the limit. timeout-minutes: 60 strategy: fail-fast: false @@ -49,3 +49,30 @@ jobs: env: RCE_FEATURES: ${{ matrix.features }} run: bash scripts/ci-tests.sh fast + + # The same three binaries, built with the tree-sitter feature. ci.yml + # runs them without that feature. Each binary has its own job so the + # feature suite above is not the sum of their times. + slow: + runs-on: ubuntu-latest + timeout-minutes: 60 + strategy: + fail-fast: false + matrix: + bin: + - break_fg8_witness + - emit_run + - form_bridge + env: + CI: "true" + steps: + - uses: actions/checkout@v4 + - name: Install the pinned Rust toolchain + run: rustup show + - uses: Swatinem/rust-cache@v2 + with: + workspaces: spec/checker + - name: ${{ matrix.bin }} with the tree-sitter feature + env: + RCE_FEATURES: tree-sitter + run: bash scripts/ci-tests.sh bin ${{ matrix.bin }} diff --git a/scripts/ci-nff.sh b/scripts/ci-nff.sh index 6d74d463..b2f37580 100644 --- a/scripts/ci-nff.sh +++ b/scripts/ci-nff.sh @@ -8,7 +8,7 @@ # A name in SLOW that has no tests/NAME.rs is an error, so the list cannot drift. set -euo pipefail cd "$(dirname "$0")/../spec/checker" -SLOW="dst_chat emit framing_rce fuel golden_apps group_rce hpke_rce mls_rce pq_rce protect_rce treekem_rce welcome_rce" +SLOW="break_fg8_witness dst_chat emit emit_run form_bridge framing_rce fuel golden_apps group_rce hpke_rce mls_rce pq_rce protect_rce treekem_rce welcome_rce" for n in $SLOW; do [ -f "tests/$n.rs" ] || { echo "ci-tests: tests/$n.rs does not exist; update SLOW" >&2; exit 1; }; done feat=() if [ -n "${RCE_FEATURES:-}" ]; then feat=(--features "$RCE_FEATURES"); fi diff --git a/scripts/ci-tests.sh b/scripts/ci-tests.sh index bf0373ca..1e66192b 100755 --- a/scripts/ci-tests.sh +++ b/scripts/ci-tests.sh @@ -8,7 +8,7 @@ # A name in SLOW that has no tests/NAME.rs is an error, so the list cannot drift. set -euo pipefail cd "$(dirname "$0")/../spec/checker" -SLOW="dst_chat emit framing_rce fuel golden_apps group_rce hpke_rce mls_rce pq_rce protect_rce treekem_rce welcome_rce" +SLOW="break_fg8_witness dst_chat emit emit_run form_bridge framing_rce fuel golden_apps group_rce hpke_rce mls_rce pq_rce protect_rce treekem_rce welcome_rce" for n in $SLOW; do [ -f "tests/$n.rs" ] || { echo "ci-tests: tests/$n.rs does not exist; update SLOW" >&2; exit 1; }; done feat=() if [ -n "${RCE_FEATURES:-}" ]; then feat=(--features "$RCE_FEATURES"); fi