From b30a9ad23c8ed8c356aa6a777fa16d6153580d5c Mon Sep 17 00:00:00 2001 From: zackees Date: Thu, 11 Jun 2026 22:40:55 -0700 Subject: [PATCH] chore(ci): unify soldr versions, per-target cache keys, drop name-only ARM wrappers Phase 1 drift fixes from the setup-soldr audit (Refs #170): - Remove the known-broken `version: 0.7.53` pins from _lint.yml, _unit-test.yml, _integration-test.yml, and linux-x86-dwarf-smoke.yml so all reusable workflows resolve the same soldr/zccache version as _build.yml (unpinned per #158) and stop splitting warm caches. - Key the soldr cache on the rust target as well as the runner label: _build.yml uses `-`, lint/test workflows use `-native`, so cross-compile targets sharing a runner no longer thrash one key while same-platform jobs share one namespace. - Delete the windows-arm lint/unit-test/integration-test wrappers: they ran on x86 `windows-2025` hosts and were byte-identical duplicates of the windows-x86 wrappers, adding zero ARM coverage. Real ARM coverage remains via the aarch64-pc-windows-msvc cross-compile build. Co-Authored-By: Claude Opus 4.7 --- .github/workflows/_build.yml | 7 ++++++- .github/workflows/_integration-test.yml | 8 ++++++-- .github/workflows/_lint.yml | 8 ++++++-- .github/workflows/_unit-test.yml | 8 ++++++-- .github/workflows/linux-x86-dwarf-smoke.yml | 4 +++- .github/workflows/windows-arm-integration-test.yml | 13 ------------- .github/workflows/windows-arm-lint.yml | 13 ------------- .github/workflows/windows-arm-unit-test.yml | 13 ------------- 8 files changed, 27 insertions(+), 47 deletions(-) delete mode 100644 .github/workflows/windows-arm-integration-test.yml delete mode 100644 .github/workflows/windows-arm-lint.yml delete mode 100644 .github/workflows/windows-arm-unit-test.yml diff --git a/.github/workflows/_build.yml b/.github/workflows/_build.yml index edebef34..166e5b26 100644 --- a/.github/workflows/_build.yml +++ b/.github/workflows/_build.yml @@ -48,7 +48,12 @@ jobs: # target-cache: false + cargo-registry-cache: false + # prebuild-deps: soldr-cook (setup-soldr v0.9.17+, #251). cache-preset: foundation - cache-key-suffix: ${{ inputs.runs-on }} + # Include the rust target: the same runner label hosts multiple + # cross-compile targets (e.g. windows-2025 builds both x86_64 and + # aarch64-pc-windows-msvc), which would otherwise thrash one key. + # "-native" lines up with the lint/test workflows' suffix so jobs + # on the same platform share one cache namespace. + cache-key-suffix: ${{ inputs.runs-on }}-${{ inputs.rust-target || 'native' }} linker: platform-default toolchain-file: rust-toolchain.ci.toml diff --git a/.github/workflows/_integration-test.yml b/.github/workflows/_integration-test.yml index 426ec30e..2c91f975 100644 --- a/.github/workflows/_integration-test.yml +++ b/.github/workflows/_integration-test.yml @@ -31,12 +31,16 @@ jobs: env: GITHUB_TOKEN: ${{ github.token }} with: - version: 0.7.53 + # No soldr version pin: keep in lockstep with _build.yml so all jobs + # resolve the same soldr/zccache version and share warm caches + # (see the pin rationale comment in _build.yml and #158). # cache-preset: foundation expands to build-cache: true + # target-cache: false + cargo-registry-cache: false + # prebuild-deps: soldr-cook (setup-soldr v0.9.17+, #251). cache-preset: foundation - cache-key-suffix: ${{ inputs.runs-on }} + # "-native" matches _build.yml's native-target suffix so lint, test, + # and native build jobs on the same runner share one cache namespace. + cache-key-suffix: ${{ inputs.runs-on }}-native linker: platform-default toolchain-file: rust-toolchain.toml # `./test` runs `soldr cargo test --workspace` (dev/debug profile). diff --git a/.github/workflows/_lint.yml b/.github/workflows/_lint.yml index aeb87030..b33a28c9 100644 --- a/.github/workflows/_lint.yml +++ b/.github/workflows/_lint.yml @@ -29,12 +29,16 @@ jobs: env: GITHUB_TOKEN: ${{ github.token }} with: - version: 0.7.53 + # No soldr version pin: keep in lockstep with _build.yml so all jobs + # resolve the same soldr/zccache version and share warm caches + # (see the pin rationale comment in _build.yml and #158). # cache-preset: foundation expands to build-cache: true + # target-cache: false + cargo-registry-cache: false + # prebuild-deps: soldr-cook (setup-soldr v0.9.17+, #251). cache-preset: foundation - cache-key-suffix: ${{ inputs.runs-on }} + # "-native" matches _build.yml's native-target suffix so lint, test, + # and native build jobs on the same runner share one cache namespace. + cache-key-suffix: ${{ inputs.runs-on }}-native linker: platform-default toolchain-file: rust-toolchain.toml # `./lint` runs `soldr cargo clippy --workspace --all-targets` diff --git a/.github/workflows/_unit-test.yml b/.github/workflows/_unit-test.yml index 7e72373d..7105e036 100644 --- a/.github/workflows/_unit-test.yml +++ b/.github/workflows/_unit-test.yml @@ -31,12 +31,16 @@ jobs: env: GITHUB_TOKEN: ${{ github.token }} with: - version: 0.7.53 + # No soldr version pin: keep in lockstep with _build.yml so all jobs + # resolve the same soldr/zccache version and share warm caches + # (see the pin rationale comment in _build.yml and #158). # cache-preset: foundation expands to build-cache: true + # target-cache: false + cargo-registry-cache: false + # prebuild-deps: soldr-cook (setup-soldr v0.9.17+, #251). cache-preset: foundation - cache-key-suffix: ${{ inputs.runs-on }} + # "-native" matches _build.yml's native-target suffix so lint, test, + # and native build jobs on the same runner share one cache namespace. + cache-key-suffix: ${{ inputs.runs-on }}-native linker: platform-default toolchain-file: rust-toolchain.toml # `./test` runs `soldr cargo test --workspace` (dev/debug profile). diff --git a/.github/workflows/linux-x86-dwarf-smoke.yml b/.github/workflows/linux-x86-dwarf-smoke.yml index d7c8466f..da4b711a 100644 --- a/.github/workflows/linux-x86-dwarf-smoke.yml +++ b/.github/workflows/linux-x86-dwarf-smoke.yml @@ -40,7 +40,9 @@ jobs: env: GITHUB_TOKEN: ${{ github.token }} with: - version: 0.7.53 + # No soldr version pin: keep in lockstep with _build.yml so all jobs + # resolve the same soldr/zccache version and share warm caches + # (see the pin rationale comment in _build.yml and #158). cache-preset: foundation cache-key-suffix: ubuntu-24.04-dwarf-smoke linker: platform-default diff --git a/.github/workflows/windows-arm-integration-test.yml b/.github/workflows/windows-arm-integration-test.yml deleted file mode 100644 index 52ee35d0..00000000 --- a/.github/workflows/windows-arm-integration-test.yml +++ /dev/null @@ -1,13 +0,0 @@ -name: Windows ARM Integration Test - -on: - push: - branches: [main] - pull_request: - workflow_dispatch: - -jobs: - call: - uses: ./.github/workflows/_integration-test.yml - with: - runs-on: windows-2025 diff --git a/.github/workflows/windows-arm-lint.yml b/.github/workflows/windows-arm-lint.yml deleted file mode 100644 index f9aba208..00000000 --- a/.github/workflows/windows-arm-lint.yml +++ /dev/null @@ -1,13 +0,0 @@ -name: Windows ARM Lint - -on: - push: - branches: [main] - pull_request: - workflow_dispatch: - -jobs: - call: - uses: ./.github/workflows/_lint.yml - with: - runs-on: windows-2025 diff --git a/.github/workflows/windows-arm-unit-test.yml b/.github/workflows/windows-arm-unit-test.yml deleted file mode 100644 index 97309da9..00000000 --- a/.github/workflows/windows-arm-unit-test.yml +++ /dev/null @@ -1,13 +0,0 @@ -name: Windows ARM Unit Test - -on: - push: - branches: [main] - pull_request: - workflow_dispatch: - -jobs: - call: - uses: ./.github/workflows/_unit-test.yml - with: - runs-on: windows-2025