From 93e4bfe9a2b44f139beb236d449e3a081e5c92fa Mon Sep 17 00:00:00 2001 From: Lindsay Holmwood Date: Thu, 29 Jan 2026 16:27:33 +1100 Subject: [PATCH 1/2] ci: use blacksmith runners for arm64 builds --- .github/workflows/release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1f0062b2..e1ff0416 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -18,7 +18,7 @@ jobs: matrix: build: - { os: blacksmith-16vcpu-ubuntu-2204, docker_platform: linux/amd64, rust_target: "x86_64-unknown-linux-gnu", cache-provider: buildjet } - - { os: linux-arm64-public, docker_platform: linux/arm64, rust_target: "aarch64-unknown-linux-gnu", cache-provider: github } + - { os: blacksmith-16vcpu-ubuntu-2404-arm, docker_platform: linux/arm64, rust_target: "aarch64-unknown-linux-gnu", cache-provider: github } env: CS_ZEROKMS_HOST: https://us-east-1.aws.zerokms.cipherstashmanaged.net CS_CTS_HOST: https://ap-southeast-2.aws.cts.cipherstashmanaged.net @@ -104,7 +104,7 @@ jobs: merge: name: Publish multi-platform image - runs-on: linux-arm64-public + runs-on: blacksmith-16vcpu-ubuntu-2404-arm timeout-minutes: 30 needs: - build From f567c04da910cbf851bdd1ba396a09f37d49f177 Mon Sep 17 00:00:00 2001 From: Lindsay Holmwood Date: Thu, 29 Jan 2026 16:31:41 +1100 Subject: [PATCH 2/2] ci: remove cache-provider option Because we always use the github cache provider, and making it an option leads to configuration drift (like using Buildjet caching with Blacksmith runners). --- .github/workflows/release.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e1ff0416..7f9cf5c7 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -17,8 +17,8 @@ jobs: fail-fast: false matrix: build: - - { os: blacksmith-16vcpu-ubuntu-2204, docker_platform: linux/amd64, rust_target: "x86_64-unknown-linux-gnu", cache-provider: buildjet } - - { os: blacksmith-16vcpu-ubuntu-2404-arm, docker_platform: linux/arm64, rust_target: "aarch64-unknown-linux-gnu", cache-provider: github } + - { os: blacksmith-16vcpu-ubuntu-2204, docker_platform: linux/amd64, rust_target: "x86_64-unknown-linux-gnu" } + - { os: blacksmith-16vcpu-ubuntu-2404-arm, docker_platform: linux/arm64, rust_target: "aarch64-unknown-linux-gnu" } env: CS_ZEROKMS_HOST: https://us-east-1.aws.zerokms.cipherstashmanaged.net CS_CTS_HOST: https://ap-southeast-2.aws.cts.cipherstashmanaged.net @@ -42,7 +42,6 @@ jobs: uses: Swatinem/rust-cache@v2 if: github.event_name == 'pull_request' # only cache in pull requests with: - cache-provider: ${{matrix.build.cache-provider}} cache-all-crates: true - uses: jdx/mise-action@v2 with: