Skip to content

Commit bb00a64

Browse files
chore: Revert to using GitHub runners (#675)
* Revert "Migrate workflows to Blacksmith (#554)" This reverts commit 0e8fdf0. * Revert "use blacksmith arm machine for arm builds" This reverts commit 595abc1.
1 parent dcb7ba6 commit bb00a64

File tree

4 files changed

+14
-12
lines changed

4 files changed

+14
-12
lines changed

.github/workflows/ghcr-publish.yml

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ jobs:
2727
platform: [linux/amd64, linux/arm64]
2828
include:
2929
- platform: linux/amd64
30-
runs-on: blacksmith-4vcpu-ubuntu-2404
30+
runs-on: ubuntu-latest
3131
- platform: linux/arm64
32-
runs-on: blacksmith-8vcpu-ubuntu-2204-arm
32+
runs-on: ubuntu-24.04-arm
3333

3434
steps:
3535
- name: Prepare
@@ -57,8 +57,8 @@ jobs:
5757
with:
5858
cosign-release: "v2.2.4"
5959

60-
- name: Setup Blacksmith Builder
61-
uses: useblacksmith/setup-docker-builder@v1
60+
- name: Set up Docker Buildx
61+
uses: docker/setup-buildx-action@v3
6262

6363
- name: Login to GitHub Packages Docker Registry
6464
uses: docker/login-action@v3
@@ -69,10 +69,12 @@ jobs:
6969

7070
- name: Build Docker image
7171
id: build
72-
uses: useblacksmith/build-push-action@v2
72+
uses: docker/build-push-action@v6
7373
with:
7474
context: .
7575
labels: ${{ steps.meta.outputs.labels }}
76+
cache-from: type=gha,scope=${{ env.PLATFORM_PAIR }}
77+
cache-to: type=gha,mode=max,scope=${{ env.PLATFORM_PAIR }}
7678
platforms: ${{ matrix.platform }}
7779
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
7880
build-args: |
@@ -107,7 +109,7 @@ jobs:
107109
run: echo "${TAGS}" | xargs -I {} cosign sign --yes {}@${DIGEST}
108110

109111
merge:
110-
runs-on: blacksmith-4vcpu-ubuntu-2404
112+
runs-on: ubuntu-latest
111113
permissions:
112114
packages: write
113115
needs:
@@ -120,8 +122,8 @@ jobs:
120122
pattern: digests-*
121123
merge-multiple: true
122124

123-
- name: Setup Blacksmith Builder
124-
uses: useblacksmith/setup-docker-builder@v1
125+
- name: Set up Docker Buildx
126+
uses: docker/setup-buildx-action@v3
125127

126128
- name: Extract Docker metadata
127129
id: meta

.github/workflows/pr-gate.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88

99
jobs:
1010
build:
11-
runs-on: blacksmith-4vcpu-ubuntu-2404
11+
runs-on: ubuntu-latest
1212
permissions:
1313
contents: read
1414
steps:
@@ -19,6 +19,6 @@ jobs:
1919

2020
- name: Build Docker image
2121
id: build
22-
uses: useblacksmith/build-push-action@v2
22+
uses: docker/build-push-action@v6
2323
with:
2424
context: .

.github/workflows/test-backend.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77

88
jobs:
99
build:
10-
runs-on: blacksmith-4vcpu-ubuntu-2404
10+
runs-on: ubuntu-latest
1111
permissions:
1212
contents: read
1313
steps:

.github/workflows/test-web.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77

88
jobs:
99
build:
10-
runs-on: blacksmith-4vcpu-ubuntu-2404
10+
runs-on: ubuntu-latest
1111
permissions:
1212
contents: read
1313
steps:

0 commit comments

Comments
 (0)