From 85543f2a4e2fa6123dff95f04de46a8b401e775c Mon Sep 17 00:00:00 2001 From: Gaurav Tiwari Date: Fri, 13 Nov 2026 17:24:36 +0000 Subject: [PATCH] Follow Nushell's split root CI job Upstream moved formatting and Clippy into a parallel lint job and removed the check step before Clippy. Every lane now runs the root job's build, tests and doctests. Series 3 starts at the commit that made the split. https://github.com/nushell/nushell/pull/19445 https://github.com/nushell/nushell/pull/19453 https://github.com/nushell/nushell/blob/396a7588af811612ebfc6de5b090d4f5674d6e51/.github/workflows/ci.yml --- test/bench/nushell_ci_test.rb | 4 ++-- tools/README.md | 32 ++++++++++++++++--------------- tools/cargo/nushell/case.toml | 4 ++-- tools/cargo/nushell/mise.toml | 2 +- tools/cargo/nushell/overlay/ci.sh | 5 +---- 5 files changed, 23 insertions(+), 24 deletions(-) diff --git a/test/bench/nushell_ci_test.rb b/test/bench/nushell_ci_test.rb index ed9ce2c6ea..5e16c389a1 100644 --- a/test/bench/nushell_ci_test.rb +++ b/test/bench/nushell_ci_test.rb @@ -8,8 +8,8 @@ def test_cache_providers_run_the_same_cargo_commands assert cached_status.success? assert_equal native.grep(/^cargo /), cached.grep(/^cargo /) calls = cached.grep(/^boringcache /) - assert_equal 5, calls.size - assert_includes calls.first, "--skip-save -- --config .cargo/ci.toml check" + assert_equal 3, calls.size + assert_includes calls.first, "--skip-save -- --config .cargo/ci.toml build" refute_includes calls.first, "--skip-restore" assert calls.drop(1).all? { it.include?("--skip-restore") } assert_includes calls.last, "test --workspace --doc --profile ci" diff --git a/tools/README.md b/tools/README.md index cd9f3ebb12..35eac56134 100644 --- a/tools/README.md +++ b/tools/README.md @@ -225,18 +225,17 @@ The collect job runs on main and branches, adds post-job save durations, and upl ## Nushell Cargo history -`cargo/nushell` starts at `168db974bad0181a35f4ccd735db0a20cb999d24`, -30 first-parent commits before the inspected November 4 head -`c27defbfe692c7de80e488f33b2f52906e8a7836`. Rolling builds visit every commit. +`cargo/nushell` starts at `396a7588af811612ebfc6de5b090d4f5674d6e51`, the +November 12 upstream commit that moved formatting and Clippy out of the root +job into a parallel lint job. Rolling builds visit every commit. Fresh builds use that starting source for both cold and warm phases. -Every lane runs the root job's Cargo formatting, check, Clippy, build, tests -and doctests, with its `ci` profile and `.cargo/ci.toml`. Source files are -unchanged. Rust is 1.97.1 and sccache is 0.17.0. Incremental compilation is off -in all lanes so sccache can cache compiler outputs. The output check runs -`nu --version` and verifies the checkout is clean. The standard-library and -Python virtualenv tests, fuzz jobs, WASM job and artifact upload are outside -this measurement. +Every lane runs the root job's Cargo build, tests and doctests, with its `ci` +profile and `.cargo/ci.toml`. Source files are unchanged. Rust is 1.97.1 and +sccache is 0.17.0. Incremental compilation is off in all lanes so sccache can +cache compiler outputs. The output check runs `nu --version` and verifies the +checkout is clean. The lint job, standard-library and Python virtualenv tests, +fuzz jobs, WASM job and artifact upload are outside this measurement. The base lanes compare BoringCache and GitHub Actions compiler caches. The plus lanes also cache Cargo registry downloads, Git dependencies and `target`. @@ -249,11 +248,14 @@ Warm runs restore without publishing. Compare providers within one platform; these runs do not reproduce the linked runner comparison or measure full CI time. Fresh and preflight dispatches accept `runner=macos windows` to select those -platforms. Rolling runs include every configured platform. Series 2 starts -from the same source with new cache scopes and `nu` cache tags; earlier records -remain available. - -Sources: [Nushell root CI](https://github.com/nushell/nushell/blob/168db974bad0181a35f4ccd735db0a20cb999d24/.github/workflows/ci.yml), +platforms. Rolling runs include every configured platform. Series 2 started +from `168db974bad0181a35f4ccd735db0a20cb999d24` with new cache scopes and `nu` +cache tags, and ran formatting, check and Clippy before the build, as the root +job did then. Series 3 follows upstream's split root job from its new starting +source with new cache scopes. Earlier records remain available. + +Sources: [Nushell root CI](https://github.com/nushell/nushell/blob/396a7588af811612ebfc6de5b090d4f5674d6e51/.github/workflows/ci.yml), +[lint job split](https://github.com/nushell/nushell/pull/19453), [runner comparison](https://github.com/nushell/nushell/pull/18810), [osquery context](https://github.com/osquery/osquery/issues/9104#issuecomment-6626417651), [sccache GitHub cache](https://github.com/mozilla/sccache/blob/v0.17.0/docs/GHA.md), diff --git a/tools/cargo/nushell/case.toml b/tools/cargo/nushell/case.toml index 3cca6b592f..26e7bc63e4 100644 --- a/tools/cargo/nushell/case.toml +++ b/tools/cargo/nushell/case.toml @@ -1,7 +1,7 @@ repo = "nushell/nushell" branch = "main" -start_sha = "168db974bad0181a35f4ccd735db0a20cb999d24" -rolling_series = 2 +start_sha = "396a7588af811612ebfc6de5b090d4f5674d6e51" +rolling_series = 3 directory = "upstream" script = ["bash", "../overlay/ci.sh"] prepare = [ diff --git a/tools/cargo/nushell/mise.toml b/tools/cargo/nushell/mise.toml index b78331ed0c..dcbc091f2b 100644 --- a/tools/cargo/nushell/mise.toml +++ b/tools/cargo/nushell/mise.toml @@ -1,3 +1,3 @@ [tools] -rust = { version = "1.97.1", profile = "minimal", components = "rustfmt,clippy" } +rust = { version = "1.97.1", profile = "minimal" } sccache = "0.17.0" diff --git a/tools/cargo/nushell/overlay/ci.sh b/tools/cargo/nushell/overlay/ci.sh index e38a872f8e..f0ee4c692d 100644 --- a/tools/cargo/nushell/overlay/ci.sh +++ b/tools/cargo/nushell/overlay/ci.sh @@ -13,9 +13,6 @@ cargo_step() { $BENCH_BORINGCACHE "${flags[@]}" -- --config .cargo/ci.toml "$@" } -cargo fmt --all --check -cargo_step restore no-save check --workspace --all-targets --profile ci -cargo_step no-restore no-save clippy --workspace --all-targets --profile ci -- -D warnings -cargo_step no-restore no-save build --workspace --all-targets --profile ci +cargo_step restore no-save build --workspace --all-targets --profile ci cargo_step no-restore no-save test --workspace --all-targets --profile ci cargo_step no-restore save test --workspace --doc --profile ci