Skip to content

Commit 18e52e4

Browse files
authored
Merge branch 'develop' into sync/api-types
2 parents 048729c + aa818c1 commit 18e52e4

8 files changed

Lines changed: 33 additions & 28 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: actions/cache@v4
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: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6
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: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6
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: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ permissions:
1919
jobs:
2020
test:
2121
name: Test
22-
runs-on: ubuntu-latest
22+
runs-on: blacksmith-8vcpu-ubuntu-2404
2323
steps:
2424
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
2525

26-
- uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0
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: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0
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: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0
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: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0
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: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0
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: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ on:
4545

4646
jobs:
4747
build:
48-
runs-on: large-linux-x86
48+
runs-on: blacksmith-32vcpu-ubuntu-2404
4949
env:
5050
BUN_SHELL: ${{ inputs.shell }}
5151
VERSION: ${{ inputs.version }}
@@ -57,7 +57,7 @@ jobs:
5757
uses: ./.github/actions/setup
5858

5959
- name: Setup Go
60-
uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0
60+
uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6
6161
with:
6262
go-version-file: apps/cli-go/go.mod
6363
cache: true
@@ -98,10 +98,15 @@ jobs:
9898
9999
smoke-test:
100100
needs: build
101+
# macos-15-intel is the slowest smoke leg and the only one not on
102+
# Blacksmith (Blacksmith macOS is ARM-only). Skip it on prereleases
103+
# (PR smoke + develop -> beta) so beta wall-clock isn't gated by it;
104+
# stable releases on main still run the full matrix.
105+
if: ${{ !(matrix.runner == 'macos-15-intel' && inputs.prerelease) }}
101106
strategy:
102107
fail-fast: false
103108
matrix:
104-
runner: [ubuntu-latest, macos-latest, macos-15-intel, windows-latest]
109+
runner: [blacksmith-8vcpu-ubuntu-2404, blacksmith-6vcpu-macos-latest, macos-15-intel, blacksmith-8vcpu-windows-2025]
105110
runs-on: ${{ matrix.runner }}
106111
env:
107112
NPM_TAG: ${{ inputs.npm_tag }}
@@ -144,7 +149,7 @@ jobs:
144149
publish:
145150
needs: smoke-test
146151
if: ${{ !inputs.dry_run }}
147-
runs-on: ubuntu-latest
152+
runs-on: blacksmith-2vcpu-ubuntu-2404
148153
env:
149154
CHANNEL: ${{ inputs.channel }}
150155
NPM_TAG: ${{ inputs.npm_tag }}
@@ -266,7 +271,7 @@ jobs:
266271
publish-homebrew:
267272
needs: publish
268273
if: ${{ !inputs.dry_run && inputs.publish_brew_scoop }}
269-
runs-on: ubuntu-latest
274+
runs-on: blacksmith-2vcpu-ubuntu-2404
270275
env:
271276
BREW_NAME: ${{ inputs.brew_name }}
272277
VERSION: ${{ inputs.version }}
@@ -308,7 +313,7 @@ jobs:
308313
publish-scoop:
309314
needs: publish
310315
if: ${{ !inputs.dry_run && inputs.publish_brew_scoop }}
311-
runs-on: ubuntu-latest
316+
runs-on: blacksmith-2vcpu-ubuntu-2404
312317
env:
313318
SCOOP_NAME: ${{ inputs.scoop_name }}
314319
VERSION: ${{ inputs.version }}

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
with:
5656
app-id: ${{ secrets.APP_ID }}
5757
private-key: ${{ secrets.GH_APP_PRIVATE_KEY }}
58-
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
58+
- uses: useblacksmith/checkout@41cdeedae8edb2e684ba22896a5fd2a3cb85db6b # v1
5959
with:
6060
fetch-depth: 0
6161
token: ${{ steps.app-token.outputs.token }}
@@ -97,7 +97,7 @@ jobs:
9797
# Authorization header overrides the App token semantic-release puts in
9898
# the push URL — making the dry-push identify as `github-actions[bot]`
9999
# and get rejected by branch protection.
100-
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
100+
- uses: useblacksmith/checkout@41cdeedae8edb2e684ba22896a5fd2a3cb85db6b # v1
101101
with:
102102
fetch-depth: 0
103103
persist-credentials: false

.github/workflows/test.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,15 @@ jobs:
2525
check:
2626
if: github.event.pull_request.draft == false || github.event_name == 'push'
2727
name: Check code quality
28-
runs-on: ubuntu-latest
28+
runs-on: blacksmith-8vcpu-ubuntu-2404
2929
steps:
3030
- name: Checkout
3131
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
3232

3333
- name: Setup
3434
uses: ./.github/actions/setup
3535
- name: Setup Go
36-
uses: actions/setup-go@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
@@ -49,15 +49,15 @@ jobs:
4949
test-core:
5050
if: github.event.pull_request.draft == false || github.event_name == 'push'
5151
name: Run unit and integration tests
52-
runs-on: ubuntu-latest
52+
runs-on: blacksmith-8vcpu-ubuntu-2404
5353
steps:
5454
- name: Checkout
5555
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
5656

5757
- name: Setup
5858
uses: ./.github/actions/setup
5959
- name: Setup Go
60-
uses: actions/setup-go@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
@@ -73,14 +73,14 @@ jobs:
7373
test-e2e:
7474
if: github.event.pull_request.draft == false || github.event_name == 'push'
7575
name: Run end-to-end tests (shard ${{ matrix.shard }}/3)
76-
runs-on: ubuntu-latest
76+
runs-on: blacksmith-8vcpu-ubuntu-2404
7777
strategy:
7878
fail-fast: false
7979
matrix:
8080
shard: [ 1, 2, 3 ]
8181
steps:
8282
- name: Checkout
83-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
83+
uses: useblacksmith/checkout@41cdeedae8edb2e684ba22896a5fd2a3cb85db6b # v1
8484
with:
8585
fetch-depth: 0
8686

@@ -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: actions/setup-go@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)