From bb00a641b6f3da5c3a56f80a918462333375913b Mon Sep 17 00:00:00 2001
From: Brendan Kellam <bshizzle1234@gmail.com>
Date: Fri, 12 Dec 2025 14:36:39 -0800
Subject: [PATCH] chore: Revert to using GitHub runners (#675)

* Revert "Migrate workflows to Blacksmith (#554)"

This reverts commit 0e8fdf0f97bc1d83fc7f0ca1a186fd9f24c25c1e.

* Revert "use blacksmith arm machine for arm builds"

This reverts commit 595abc12be7bbcc4e2120c45cfe36b5356cdbc4f.
---
 .github/workflows/ghcr-publish.yml | 18 ++++++++++--------
 .github/workflows/pr-gate.yml      |  4 ++--
 .github/workflows/test-backend.yml |  2 +-
 .github/workflows/test-web.yml     |  2 +-
 4 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/ghcr-publish.yml b/.github/workflows/ghcr-publish.yml
index 67bb9071..278f6fe5 100644
--- a/.github/workflows/ghcr-publish.yml
+++ b/.github/workflows/ghcr-publish.yml
@@ -27,9 +27,9 @@ jobs:
         platform: [linux/amd64, linux/arm64]
         include:
           - platform: linux/amd64
-            runs-on: blacksmith-4vcpu-ubuntu-2404
+            runs-on: ubuntu-latest
           - platform: linux/arm64
-            runs-on: blacksmith-8vcpu-ubuntu-2204-arm
+            runs-on: ubuntu-24.04-arm
 
     steps:
       - name: Prepare
@@ -57,8 +57,8 @@ jobs:
         with:
           cosign-release: "v2.2.4"
 
-      - name: Setup Blacksmith Builder
-        uses: useblacksmith/setup-docker-builder@v1
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
 
       - name: Login to GitHub Packages Docker Registry
         uses: docker/login-action@v3
@@ -69,10 +69,12 @@ jobs:
 
       - name: Build Docker image
         id: build
-        uses: useblacksmith/build-push-action@v2
+        uses: docker/build-push-action@v6
         with:
           context: .
           labels: ${{ steps.meta.outputs.labels }}
+          cache-from: type=gha,scope=${{ env.PLATFORM_PAIR }}
+          cache-to: type=gha,mode=max,scope=${{ env.PLATFORM_PAIR }}
           platforms: ${{ matrix.platform }}
           outputs: type=image,name=${{ env.REGISTRY_IMAGE }},push-by-digest=true,name-canonical=true,push=true,annotation.org.opencontainers.image.description=Blazingly fast code search
           build-args: |
@@ -107,7 +109,7 @@ jobs:
         run: echo "${TAGS}" | xargs -I {} cosign sign --yes {}@${DIGEST}
   
   merge:
-    runs-on: blacksmith-4vcpu-ubuntu-2404
+    runs-on: ubuntu-latest
     permissions:
       packages: write
     needs:
@@ -120,8 +122,8 @@ jobs:
           pattern: digests-*
           merge-multiple: true
       
-      - name: Setup Blacksmith Builder
-        uses: useblacksmith/setup-docker-builder@v1
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
       
       - name: Extract Docker metadata
         id: meta
diff --git a/.github/workflows/pr-gate.yml b/.github/workflows/pr-gate.yml
index 12750446..de59790f 100644
--- a/.github/workflows/pr-gate.yml
+++ b/.github/workflows/pr-gate.yml
@@ -8,7 +8,7 @@ on:
 
 jobs:
   build:
-    runs-on: blacksmith-4vcpu-ubuntu-2404
+    runs-on: ubuntu-latest
     permissions:
       contents: read
     steps:
@@ -19,6 +19,6 @@ jobs:
 
       - name: Build Docker image
         id: build
-        uses: useblacksmith/build-push-action@v2
+        uses: docker/build-push-action@v6
         with:
           context: .
diff --git a/.github/workflows/test-backend.yml b/.github/workflows/test-backend.yml
index 37ea3e77..5d4b5fde 100644
--- a/.github/workflows/test-backend.yml
+++ b/.github/workflows/test-backend.yml
@@ -7,7 +7,7 @@ on:
 
 jobs:
   build:
-    runs-on: blacksmith-4vcpu-ubuntu-2404
+    runs-on: ubuntu-latest
     permissions:
       contents: read
     steps:
diff --git a/.github/workflows/test-web.yml b/.github/workflows/test-web.yml
index 006ba0e5..108cc277 100644
--- a/.github/workflows/test-web.yml
+++ b/.github/workflows/test-web.yml
@@ -7,7 +7,7 @@ on:
 
 jobs:
   build:
-    runs-on: blacksmith-4vcpu-ubuntu-2404
+    runs-on: ubuntu-latest
     permissions:
       contents: read
     steps: