From e3188e6109e120bbf4bcd5f2293263a702c1c724 Mon Sep 17 00:00:00 2001
From: "blacksmith-sh[bot]"
 <157653362+blacksmith-sh[bot]@users.noreply.github.com>
Date: Fri, 1 May 2026 20:57:00 +0000
Subject: [PATCH 1/2] Migrate workflows to Blacksmith

---
 .github/workflows/ci.yml                | 4 ++--
 .github/workflows/nix.yml               | 2 +-
 .github/workflows/release-preflight.yml | 6 +++---
 .github/workflows/release.yml           | 6 +++---
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ce820cfa2..b7c909d73 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -15,7 +15,7 @@ jobs:
   bun:
     if: github.repository == 'athasdev/athas'
     name: Bun — typecheck, frontend check
-    runs-on: ubuntu-latest
+    runs-on: blacksmith-4vcpu-ubuntu-2404
     steps:
       - uses: actions/checkout@v4
 
@@ -41,7 +41,7 @@ jobs:
   rust:
     if: github.repository == 'athasdev/athas'
     name: Rust — fmt, cargo check
-    runs-on: ubuntu-latest
+    runs-on: blacksmith-4vcpu-ubuntu-2404
     env:
       CARGO_TERM_COLOR: always
     steps:
diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml
index 4ed82dc97..7d86ec032 100644
--- a/.github/workflows/nix.yml
+++ b/.github/workflows/nix.yml
@@ -21,7 +21,7 @@ on:
 jobs:
   dev-shell:
     name: Dev shell
-    runs-on: ubuntu-24.04
+    runs-on: blacksmith-4vcpu-ubuntu-2404
     steps:
       - name: Checkout
         uses: actions/checkout@v6
diff --git a/.github/workflows/release-preflight.yml b/.github/workflows/release-preflight.yml
index 87a7beecd..cb48ace34 100644
--- a/.github/workflows/release-preflight.yml
+++ b/.github/workflows/release-preflight.yml
@@ -9,7 +9,7 @@ concurrency:
 
 jobs:
   readiness:
-    runs-on: ubuntu-latest
+    runs-on: blacksmith-4vcpu-ubuntu-2404
     permissions:
       contents: read
     steps:
@@ -65,7 +65,7 @@ jobs:
           bun scripts/check-zig.ts
 
   macos-readiness:
-    runs-on: macos-latest
+    runs-on: blacksmith-6vcpu-macos-15
     steps:
       - uses: actions/checkout@v6
 
@@ -114,7 +114,7 @@ jobs:
             >/dev/null
 
   windows-readiness:
-    runs-on: windows-latest
+    runs-on: blacksmith-4vcpu-windows-2025
     steps:
       - uses: actions/checkout@v6
 
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 74d25f189..33fbfb04a 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -17,7 +17,7 @@ concurrency:
 
 jobs:
   release-metadata:
-    runs-on: ubuntu-latest
+    runs-on: blacksmith-4vcpu-ubuntu-2404
     permissions:
       contents: read
     if: ${{ startsWith(github.ref, 'refs/tags/v') || github.event_name == 'workflow_dispatch' }}
@@ -84,7 +84,7 @@ jobs:
       matrix:
         include:
           - platform: "macos-latest"
-            artifact: "macos-aarch64"
+            artifact: "blacksmith-6vcpu-macos-15"
             os: "macos"
             args: "--target aarch64-apple-darwin"
             cargo_features: ""
@@ -394,7 +394,7 @@ jobs:
 
   assemble-release:
     needs: [release-metadata, build-tauri]
-    runs-on: ubuntu-latest
+    runs-on: blacksmith-4vcpu-ubuntu-2404
     permissions:
       contents: write
     if: ${{ success() && (startsWith(github.ref, 'refs/tags/v') || github.event_name == 'workflow_dispatch') }}

From 7829485f055b5363b27447fa87598b9e1d0aaf7d Mon Sep 17 00:00:00 2001
From: mehmetozguldev <mehmetozguldev@gmail.com>
Date: Fri, 1 May 2026 20:59:42 +0000
Subject: [PATCH 2/2] Run nix develop validation in non-login shell

The Validate dev tools step previously launched bash with -l, which
loads the runner user's login profile and reorders PATH so system
tools shadow the ones provided by nix develop. On the Blacksmith
runner image this surfaces a Node 20 install ahead of nix's nodejs_22
and drops bun entirely, breaking the dev shell check.

Drop -l so the shell only inherits the environment set up by nix
develop, which is the intent of the step.

Co-authored-by: Codesmith <codesmith-bot@users.noreply.github.com>
---
 .github/workflows/nix.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml
index 7d86ec032..9b429081c 100644
--- a/.github/workflows/nix.yml
+++ b/.github/workflows/nix.yml
@@ -34,7 +34,7 @@ jobs:
 
       - name: Validate dev tools
         run: |
-          nix develop --no-write-lock-file --command bash -lc '
+          nix develop --no-write-lock-file --command bash -c '
             bun --version
             node --version
             rustc --version