From 39479c248ea49e7a3e9bd27da66bcb38181be4db Mon Sep 17 00:00:00 2001
From: Marshall Porter <meoporter@gmail.com>
Date: Sun, 16 Aug 2026 15:10:15 -0700
Subject: [PATCH 1/3] ci: enforce the committed lockfile

Co-authored-by: OpenAI Codex <codex@openai.com>
---
 .github/workflows/CICD.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/CICD.yml b/.github/workflows/CICD.yml
index c6db64171..2fd72ac59 100644
--- a/.github/workflows/CICD.yml
+++ b/.github/workflows/CICD.yml
@@ -30,10 +30,10 @@ jobs:
       run: cargo fmt --all -- --check
     - name: "`clippy` testing"
       if: success() || failure() # run regardless of prior step ("`fmt` testing") success/failure
-      run: cargo clippy --tests -- -D warnings
+      run: cargo clippy --locked --tests -- -D warnings
     - name: "`clap` deprecated checks"
       if: success() || failure() # run regardless of prior step ("`fmt` testing") success/failure
-      run: cargo check --features clap/deprecated
+      run: cargo check --locked --features clap/deprecated
 
   min_version:
     name: MinSRV # Minimum supported rust version
@@ -46,7 +46,7 @@ jobs:
         toolchain: ${{ env.RUST_MIN_SRV }}
         rustflags: ""
     - name: Test
-      run: cargo test
+      run: cargo test --locked
 
   build:
     name: Build
@@ -182,10 +182,10 @@ jobs:
       run: cross build --release --target=${{ matrix.job.target }} --locked
     - name: Test with Cargo
       if: ${{ !steps.vars.outputs.CARGO_USE_CROSS }}
-      run: cargo test --target=${{ matrix.job.target }} ${{ steps.vars.outputs.CARGO_TEST_OPTIONS}}
+      run: cargo test --locked --target=${{ matrix.job.target }} ${{ steps.vars.outputs.CARGO_TEST_OPTIONS}}
     - name: Test with cross
       if: steps.vars.outputs.CARGO_USE_CROSS
-      run: cross test --target=${{ matrix.job.target }} ${{ steps.vars.outputs.CARGO_TEST_OPTIONS}}
+      run: cross test --locked --target=${{ matrix.job.target }} ${{ steps.vars.outputs.CARGO_TEST_OPTIONS}}
     - name: Archive executable artifacts
       uses: actions/upload-artifact@v7
       with:

From 47236da3707da91b3e0336e9d012cf396b7338ca Mon Sep 17 00:00:00 2001
From: Marshall Porter <meoporter@gmail.com>
Date: Sun, 16 Aug 2026 15:59:42 -0700
Subject: [PATCH 2/3] ci: retry transient cross builds


From fa072a64f8ef60bec6f653cffd5dbc500147ce51 Mon Sep 17 00:00:00 2001
From: Marshall Porter <meoporter@gmail.com>
Date: Sun, 16 Aug 2026 16:07:02 -0700
Subject: [PATCH 3/3] ci: isolate build caches by target

---
 .github/workflows/CICD.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/CICD.yml b/.github/workflows/CICD.yml
index 2fd72ac59..9049d6de7 100644
--- a/.github/workflows/CICD.yml
+++ b/.github/workflows/CICD.yml
@@ -168,6 +168,7 @@ jobs:
       with:
         toolchain: ${{ steps.vars.outputs.TOOLCHAIN }}
         target: ${{ matrix.job.target }}
+        cache-key: ${{ matrix.job.target }}
         rustflags: ""
     - name: Install `cross`
       if: steps.vars.outputs.CARGO_USE_CROSS