From 67aada14b9b78030edd36db974a29d866887f2a8 Mon Sep 17 00:00:00 2001 From: "Darwin D. Wu" Date: Fri, 14 Aug 2026 23:34:45 -0700 Subject: [PATCH 1/2] ci: migrate remaining release jobs to Blacksmith Move explicit release orchestration jobs to Blacksmith Linux runners and configure cargo-dist's generated build matrix to use Blacksmith runners for every release target. --- .github/workflows/release-smoke.yml | 2 +- .github/workflows/release.yml | 6 +++--- Cargo.toml | 8 ++++++++ 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release-smoke.yml b/.github/workflows/release-smoke.yml index 0a79880..d0257bf 100644 --- a/.github/workflows/release-smoke.yml +++ b/.github/workflows/release-smoke.yml @@ -84,7 +84,7 @@ jobs: name: Server release gate needs: containers if: always() - runs-on: ubuntu-22.04 + runs-on: blacksmith-2vcpu-ubuntu-2404 steps: - name: Require both server architectures diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 2334b03..63835d6 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -24,7 +24,7 @@ jobs: (github.event.pull_request.base.ref == github.event.repository.default_branch && github.event.pull_request.head.ref == 'release/next' && github.event.pull_request.head.repo.full_name == github.repository) - runs-on: ubuntu-22.04 + runs-on: blacksmith-2vcpu-ubuntu-2404 outputs: manifest: ${{ steps.plan.outputs.manifest }} prerelease: ${{ steps.version.outputs.prerelease }} @@ -232,7 +232,7 @@ jobs: build-installers: name: Build CLI installers and checksums needs: [plan, build-cli] - runs-on: ubuntu-22.04 + runs-on: blacksmith-2vcpu-ubuntu-2404 env: BUILD_MANIFEST_NAME: target/distrib/global-dist-manifest.json @@ -283,7 +283,7 @@ jobs: name: CLI release gate needs: [plan, build-cli, build-installers] if: always() - runs-on: ubuntu-22.04 + runs-on: blacksmith-2vcpu-ubuntu-2404 steps: - name: Require the complete release matrix diff --git a/Cargo.toml b/Cargo.toml index b3ebd73..146814d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -25,6 +25,14 @@ targets = [ "x86_64-pc-windows-msvc", ] +[workspace.metadata.dist.github-custom-runners] +global = "blacksmith-2vcpu-ubuntu-2404" +x86_64-unknown-linux-gnu = "blacksmith-2vcpu-ubuntu-2404" +aarch64-unknown-linux-gnu = "blacksmith-2vcpu-ubuntu-2404-arm" +x86_64-apple-darwin = "blacksmith-6vcpu-macos-15" +aarch64-apple-darwin = "blacksmith-6vcpu-macos-15" +x86_64-pc-windows-msvc = "blacksmith-2vcpu-windows-2025" + [profile.dist] inherits = "release" lto = "thin" From 30c99d3f08b59ba43cba7b2df0939e74f7ac25bc Mon Sep 17 00:00:00 2001 From: "Darwin D. Wu" Date: Fri, 14 Aug 2026 23:37:33 -0700 Subject: [PATCH 2/2] ci: use native macOS release runners Let cargo-dist select GitHub-hosted ARM and Intel macOS runners while retaining Blacksmith overrides for Linux and Windows. --- Cargo.toml | 2 -- 1 file changed, 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 146814d..3def496 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -29,8 +29,6 @@ targets = [ global = "blacksmith-2vcpu-ubuntu-2404" x86_64-unknown-linux-gnu = "blacksmith-2vcpu-ubuntu-2404" aarch64-unknown-linux-gnu = "blacksmith-2vcpu-ubuntu-2404-arm" -x86_64-apple-darwin = "blacksmith-6vcpu-macos-15" -aarch64-apple-darwin = "blacksmith-6vcpu-macos-15" x86_64-pc-windows-msvc = "blacksmith-2vcpu-windows-2025" [profile.dist]