From 10977365ff697143d1688513bd4e0dda377381e1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Thu, 20 Feb 2025 20:58:16 +0100
Subject: [PATCH 1/3] Run some jobs on blacksmith

---
 .github/workflows/ci.yml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6485288e8..95d6633fd 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -15,7 +15,7 @@ permissions:
 
 jobs:
   eval:
-    runs-on: UbuntuLatest32Cores128G
+    runs-on: blacksmith-32vcpu-ubuntu-2204
     steps:
     - uses: actions/checkout@v4
       with:
@@ -28,13 +28,13 @@ jobs:
   build_x86_64-linux:
     uses: ./.github/workflows/build.yml
     with:
-      os: UbuntuLatest32Cores128G
+      os: blacksmith-32vcpu-ubuntu-2204
 
   build_aarch64-linux:
     if: github.event_name == 'merge_group'
     uses: ./.github/workflows/build.yml
     with:
-      os: UbuntuLatest32Cores128GArm
+      os: blacksmith-32vcpu-ubuntu-2204-arm
 
   build_x86_64-darwin:
     if: github.event_name == 'merge_group'
@@ -51,14 +51,14 @@ jobs:
     uses: ./.github/workflows/test.yml
     needs: build_x86_64-linux
     with:
-      os: UbuntuLatest32Cores128G
+      os: blacksmith-32vcpu-ubuntu-2204
 
   test_aarch64-linux:
     if: github.event_name == 'merge_group'
     uses: ./.github/workflows/test.yml
     needs: build_aarch64-linux
     with:
-      os: UbuntuLatest32Cores128GArm
+      os: blacksmith-32vcpu-ubuntu-2204-arm
 
   test_x86_64-darwin:
     if: github.event_name == 'merge_group'
@@ -76,7 +76,7 @@ jobs:
 
   vm_tests_smoke:
     needs: build_x86_64-linux
-    runs-on: UbuntuLatest32Cores128G
+    runs-on: blacksmith-32vcpu-ubuntu-2204
     steps:
       - uses: actions/checkout@v4
       - uses: DeterminateSystems/nix-installer-action@main
@@ -94,7 +94,7 @@ jobs:
   vm_tests_all:
     if: github.event_name == 'merge_group'
     needs: build_x86_64-linux
-    runs-on: UbuntuLatest32Cores128G
+    runs-on: blacksmith-32vcpu-ubuntu-2204
     steps:
       - uses: actions/checkout@v4
       - uses: DeterminateSystems/nix-installer-action@main
@@ -114,7 +114,7 @@ jobs:
   flake_regressions:
     if: github.event_name == 'merge_group'
     needs: build_x86_64-linux
-    runs-on: UbuntuLatest32Cores128G
+    runs-on: blacksmith-32vcpu-ubuntu-2204
     steps:
       - name: Checkout nix
         uses: actions/checkout@v4

From 3e39ac4fc9b26cee32d743fafd8895ea0f642887 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Thu, 20 Feb 2025 21:06:17 +0100
Subject: [PATCH 2/3] Don't run vm_tests_smoke in the merge queue

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

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 95d6633fd..98efc7a57 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -75,6 +75,7 @@ jobs:
       os: macos-latest
 
   vm_tests_smoke:
+    if: github.event_name != 'merge_group'
     needs: build_x86_64-linux
     runs-on: blacksmith-32vcpu-ubuntu-2204
     steps:

From 835b3b4efe714ea0457ad627a32533e480192959 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Thu, 20 Feb 2025 21:39:01 +0100
Subject: [PATCH 3/3] Fix vm_tests_all

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 98efc7a57..60b75a439 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -109,7 +109,7 @@ jobs:
                 .hydraJobs.tests
                 | with_entries(select(.value.type == "derivation"))
                 | keys[]
-                | ".#hydraJobs.tests." + .'
+                | ".#hydraJobs.tests." + .' \
               | head -n5) # FIXME: for testing the merge queue
 
   flake_regressions: