Skip to content

Commit dafe477

Browse files
committed
ci: revert deprecated useblacksmith forks and extend Blacksmith coverage
The useblacksmith/cache, useblacksmith/setup-node, useblacksmith/setup-go forks are now archived. Blacksmith's colocated cache is applied at the runner level (network/DNS interception of cache API calls), so upstream actions/cache@v5, actions/setup-node@v6 and actions/setup-go@v6 hit the same 4x backend transparently — with continued security patches and upstream improvements. Revert prior swaps (PR1 19c4534, PR5 9b05731/3dad0ae) to SHA-pinned upstream actions, bump test.yml's residual actions/cache@v4 to v5, and migrate previously-skipped low-frequency Linux jobs (api-sync, mirror, codeql, release publish/homebrew/scoop) to Blacksmith runners for consistency. useblacksmith/checkout is unchanged — it's a separate sticky-disk product, not part of the deprecated cache-fork family.
1 parent 3dad0ae commit dafe477

7 files changed

Lines changed: 19 additions & 19 deletions

File tree

.github/actions/setup/action.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ runs:
1111

1212
- name: Restore Bun toolchain cache
1313
id: bun-toolchain-cache
14-
uses: useblacksmith/cache@71c7c918062ba3861252d84b07fe5ab2a6b467a6 # v5
14+
uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5
1515
with:
1616
path: /opt/hostedtoolcache/bun
1717
key: bun-toolchain-${{ runner.os }}-${{ runner.arch }}-${{ env.BUN_VERSION }}
@@ -39,7 +39,7 @@ runs:
3939
run: bun --version
4040

4141
- name: Install Node.js
42-
uses: useblacksmith/setup-node@65c6ca86fdeb0ab3d85e78f57e4f6a7e4780b391 # v5
42+
uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
4343
with:
4444
node-version-file: .nvmrc
4545
package-manager-cache: false
@@ -49,7 +49,7 @@ runs:
4949
run: npm install --global --force corepack && corepack enable
5050

5151
- name: Configure dependency cache
52-
uses: useblacksmith/setup-node@65c6ca86fdeb0ab3d85e78f57e4f6a7e4780b391 # v5
52+
uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
5353
with:
5454
cache: pnpm
5555

.github/workflows/cli-go-api-sync.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ permissions:
1212
jobs:
1313
sync:
1414
name: Sync API Types
15-
runs-on: ubuntu-latest
15+
runs-on: blacksmith-2vcpu-ubuntu-2404
1616
steps:
1717
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
1818

.github/workflows/cli-go-ci.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
steps:
2424
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
2525

26-
- uses: useblacksmith/setup-go@f12a3dabb4171193018e496855e47349b360c056 # v5
26+
- uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6
2727
with:
2828
go-version-file: apps/cli-go/go.mod
2929
cache: true
@@ -60,7 +60,7 @@ jobs:
6060
steps:
6161
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
6262

63-
- uses: useblacksmith/setup-go@f12a3dabb4171193018e496855e47349b360c056 # v5
63+
- uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6
6464
with:
6565
go-version-file: apps/cli-go/go.mod
6666
# Linter requires no cache
@@ -78,7 +78,7 @@ jobs:
7878
runs-on: ubuntu-latest
7979
steps:
8080
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
81-
- uses: useblacksmith/setup-go@f12a3dabb4171193018e496855e47349b360c056 # v5
81+
- uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6
8282
with:
8383
go-version-file: apps/cli-go/go.mod
8484
cache: true
@@ -102,7 +102,7 @@ jobs:
102102
runs-on: ubuntu-latest
103103
steps:
104104
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
105-
- uses: useblacksmith/setup-go@f12a3dabb4171193018e496855e47349b360c056 # v5
105+
- uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6
106106
with:
107107
go-version-file: apps/cli-go/go.mod
108108
cache: true
@@ -118,7 +118,7 @@ jobs:
118118
steps:
119119
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
120120

121-
- uses: useblacksmith/setup-go@f12a3dabb4171193018e496855e47349b360c056 # v5
121+
- uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6
122122
with:
123123
go-version-file: apps/cli-go/go.mod
124124
cache: true

.github/workflows/cli-go-codeql.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
# - https://gh.io/supported-runners-and-hardware-resources
3333
# - https://gh.io/using-larger-runners (GitHub.com only)
3434
# Consider using larger runners or machines with greater resources for possible analysis time improvements.
35-
runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }}
35+
runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'blacksmith-8vcpu-ubuntu-2404' }}
3636
timeout-minutes: ${{ (matrix.language == 'swift' && 120) || 360 }}
3737
permissions:
3838
# required for all workflows

.github/workflows/cli-go-mirror.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ permissions:
2222

2323
jobs:
2424
setup:
25-
runs-on: ubuntu-latest
25+
runs-on: blacksmith-2vcpu-ubuntu-2404
2626
outputs:
2727
tags: ${{ steps.list.outputs.tags }}
2828
curr: ${{ steps.curr.outputs.tags }}

.github/workflows/release-shared.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757
uses: ./.github/actions/setup
5858

5959
- name: Setup Go
60-
uses: useblacksmith/setup-go@f12a3dabb4171193018e496855e47349b360c056 # v5
60+
uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6
6161
with:
6262
go-version-file: apps/cli-go/go.mod
6363
cache: true
@@ -149,7 +149,7 @@ jobs:
149149
publish:
150150
needs: smoke-test
151151
if: ${{ !inputs.dry_run }}
152-
runs-on: ubuntu-latest
152+
runs-on: blacksmith-2vcpu-ubuntu-2404
153153
env:
154154
CHANNEL: ${{ inputs.channel }}
155155
NPM_TAG: ${{ inputs.npm_tag }}
@@ -271,7 +271,7 @@ jobs:
271271
publish-homebrew:
272272
needs: publish
273273
if: ${{ !inputs.dry_run && inputs.publish_brew_scoop }}
274-
runs-on: ubuntu-latest
274+
runs-on: blacksmith-2vcpu-ubuntu-2404
275275
env:
276276
BREW_NAME: ${{ inputs.brew_name }}
277277
VERSION: ${{ inputs.version }}
@@ -313,7 +313,7 @@ jobs:
313313
publish-scoop:
314314
needs: publish
315315
if: ${{ !inputs.dry_run && inputs.publish_brew_scoop }}
316-
runs-on: ubuntu-latest
316+
runs-on: blacksmith-2vcpu-ubuntu-2404
317317
env:
318318
SCOOP_NAME: ${{ inputs.scoop_name }}
319319
VERSION: ${{ inputs.version }}

.github/workflows/test.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
- name: Setup
3434
uses: ./.github/actions/setup
3535
- name: Setup Go
36-
uses: useblacksmith/setup-go@f12a3dabb4171193018e496855e47349b360c056 # v5
36+
uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6
3737
with:
3838
go-version-file: apps/cli-go/go.mod
3939
cache-dependency-path: apps/cli-go/go.sum
@@ -57,7 +57,7 @@ jobs:
5757
- name: Setup
5858
uses: ./.github/actions/setup
5959
- name: Setup Go
60-
uses: useblacksmith/setup-go@f12a3dabb4171193018e496855e47349b360c056 # v5
60+
uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6
6161
with:
6262
go-version-file: apps/cli-go/go.mod
6363
cache-dependency-path: apps/cli-go/go.sum
@@ -114,7 +114,7 @@ jobs:
114114
- name: Cache Go CLI binary
115115
if: steps.detect.outputs.cli_e2e == 'true'
116116
id: cache-go-binary
117-
uses: actions/cache@v4
117+
uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5
118118
with:
119119
path: apps/cli-go/supabase-go
120120
key: go-cli-${{ runner.os }}-${{ hashFiles('apps/cli-go/**/*.go',
@@ -123,7 +123,7 @@ jobs:
123123
- name: Setup Go
124124
if: steps.detect.outputs.cli_e2e == 'true' &&
125125
steps.cache-go-binary.outputs.cache-hit != 'true'
126-
uses: useblacksmith/setup-go@f12a3dabb4171193018e496855e47349b360c056 # v5
126+
uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6
127127
with:
128128
go-version-file: apps/cli-go/go.mod
129129
cache-dependency-path: apps/cli-go/go.sum

0 commit comments

Comments
 (0)