Skip to content

Commit 9c103b7

Browse files
authored
ci(fork): run workflows on GitHub-hosted runners (#5)
ci(fork): run workflows on GitHub-hosted runners
2 parents fc74929 + 33db951 commit 9c103b7

19 files changed

Lines changed: 94 additions & 68 deletions

‎.github/fork/use-github-runners.sh‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
#!/usr/bin/env bash
2+
# Points this fork's workflows at GitHub-hosted runners: Blacksmith needs a GitHub organization,
3+
# and this fork is a personal account. Idempotent; re-run it after each upstream integration.
4+
set -euo pipefail
5+
cd "$(dirname "$0")/../workflows"
6+
7+
# Arm before plain Ubuntu: "ubuntu-2404" is a prefix of "ubuntu-2404-arm".
8+
# macOS 27 has no "macos-27" label on GitHub; its image is named for its Xcode.
9+
# stickydisk is Blacksmith-only; actions/cache takes the same key and path inputs.
10+
sed -i -E \
11+
-e 's/blacksmith-[0-9]+vcpu-ubuntu-2404-arm/ubuntu-24.04-arm/g' \
12+
-e 's/blacksmith-[0-9]+vcpu-ubuntu-2404/ubuntu-24.04/g' \
13+
-e 's/blacksmith-[0-9]+vcpu-macos-27/xcode-27/g' \
14+
-e 's/blacksmith-[0-9]+vcpu-macos-26/macos-26/g' \
15+
-e 's/blacksmith-[0-9]+vcpu-windows-2025/windows-2025/g' \
16+
-e 's#/etc/apt/blacksmith-ubuntu-mirrors\.txt ##g' \
17+
-e 's#uses: useblacksmith/stickydisk@[0-9a-f]+( \# v[0-9.]+)?#uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 \# v6.1.0#g' \
18+
./*.yml
19+
20+
if grep -nE 'blacksmith' ./*.yml | grep -v '# blacksmith-'; then
21+
echo "Blacksmith references remain; extend this script." >&2
22+
exit 1
23+
fi

‎.github/workflows/ci.yml‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
# open: if the diff cannot be resolved, everything runs.
2323
changes:
2424
name: Changes
25-
runs-on: blacksmith-2vcpu-ubuntu-2404
25+
runs-on: ubuntu-24.04
2626
timeout-minutes: 5
2727
outputs:
2828
typecheck: ${{ steps.detect.outputs.typecheck }}
@@ -65,7 +65,7 @@ jobs:
6565
contents: read
6666
id-token: write
6767
name: Lint
68-
runs-on: blacksmith-8vcpu-ubuntu-2404
68+
runs-on: ubuntu-24.04
6969
timeout-minutes: 10
7070
steps:
7171
- name: Checkout
@@ -121,7 +121,7 @@ jobs:
121121
name: Build and Typecheck
122122
needs: changes
123123
if: ${{ !cancelled() && (needs.changes.outputs.build != 'false' || needs.changes.outputs.typecheck != 'false') }}
124-
runs-on: blacksmith-8vcpu-ubuntu-2404
124+
runs-on: ubuntu-24.04
125125
timeout-minutes: 10
126126
steps:
127127
- name: Checkout
@@ -144,7 +144,7 @@ jobs:
144144
# Fetch only the indexes these main and universe packages need. The full set is ~42 MB,
145145
# which a slow mirror can stretch past the wait below.
146146
sudo sed -i -e 's|http://|https://|g' -e 's/^Components: .*/Components: main universe/' \
147-
/etc/apt/blacksmith-ubuntu-mirrors.txt /etc/apt/sources.list.d/ubuntu.sources
147+
/etc/apt/sources.list.d/ubuntu.sources
148148
(
149149
set +e
150150
sudo apt-get update -o Acquire::Languages=none \
@@ -276,7 +276,7 @@ jobs:
276276
name: Test
277277
needs: changes
278278
if: ${{ !cancelled() && needs.changes.outputs.test != 'false' }}
279-
runs-on: blacksmith-8vcpu-ubuntu-2404
279+
runs-on: ubuntu-24.04
280280
timeout-minutes: 10
281281
steps:
282282
- name: Checkout
@@ -297,7 +297,7 @@ jobs:
297297
# Fetch only the indexes these main and universe packages need. The full set is ~42 MB,
298298
# which a slow mirror can stretch past the wait below.
299299
sudo sed -i -e 's|http://|https://|g' -e 's/^Components: .*/Components: main universe/' \
300-
/etc/apt/blacksmith-ubuntu-mirrors.txt /etc/apt/sources.list.d/ubuntu.sources
300+
/etc/apt/sources.list.d/ubuntu.sources
301301
(
302302
set +e
303303
sudo apt-get update -o Acquire::Languages=none \
@@ -366,7 +366,7 @@ jobs:
366366
name: Test Web ${{ matrix.shard }}
367367
needs: changes
368368
if: ${{ !cancelled() && needs.changes.outputs.test_web != 'false' }}
369-
runs-on: blacksmith-8vcpu-ubuntu-2404
369+
runs-on: ubuntu-24.04
370370
timeout-minutes: 10
371371
strategy:
372372
fail-fast: false
@@ -428,7 +428,7 @@ jobs:
428428
contents: read
429429
id-token: write
430430
name: Test Server ${{ matrix.shard }}
431-
runs-on: blacksmith-4vcpu-ubuntu-2404
431+
runs-on: ubuntu-24.04
432432
# Shards take 2-5 minutes. When the shared task cache throttles reads, each
433433
# failed fetch stalls vp for 15-90s, which pushed shards past 10 minutes.
434434
timeout-minutes: 20
@@ -558,7 +558,7 @@ jobs:
558558
name: Rust
559559
needs: changes
560560
if: ${{ !cancelled() && needs.changes.outputs.rust != 'false' }}
561-
runs-on: blacksmith-4vcpu-ubuntu-2404
561+
runs-on: ubuntu-24.04
562562
timeout-minutes: 10
563563
steps:
564564
- name: Checkout
@@ -592,7 +592,7 @@ jobs:
592592
name: Mobile Native Static Analysis
593593
needs: changes
594594
if: ${{ !cancelled() && needs.changes.outputs.mobile_native != 'false' }}
595-
runs-on: blacksmith-6vcpu-macos-27
595+
runs-on: xcode-27
596596
timeout-minutes: 10
597597
steps:
598598
- name: Checkout
@@ -625,7 +625,7 @@ jobs:
625625
name: Release Smoke
626626
needs: changes
627627
if: ${{ !cancelled() && needs.changes.outputs.release_smoke != 'false' }}
628-
runs-on: blacksmith-8vcpu-ubuntu-2404
628+
runs-on: ubuntu-24.04
629629
timeout-minutes: 15
630630
steps:
631631
- name: Checkout
@@ -654,7 +654,7 @@ jobs:
654654
name: Native OMP Policy
655655
needs: changes
656656
if: ${{ !cancelled() && needs.changes.outputs.omp_native_policy != 'false' }}
657-
runs-on: blacksmith-4vcpu-ubuntu-2404
657+
runs-on: ubuntu-24.04
658658
timeout-minutes: 10
659659
steps:
660660
- uses: actions/checkout@v6
@@ -686,7 +686,7 @@ jobs:
686686
release_smoke,
687687
omp_native_policy,
688688
]
689-
runs-on: blacksmith-2vcpu-ubuntu-2404
689+
runs-on: ubuntu-24.04
690690
timeout-minutes: 5
691691
steps:
692692
- name: Require every job to pass

‎.github/workflows/deploy-relay.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
name: Deploy production relay
2828
# A manual run from another branch would deploy that branch to production.
2929
if: github.repository == 'pingdotgg/t3code' && github.ref == 'refs/heads/main'
30-
runs-on: blacksmith-8vcpu-ubuntu-2404
30+
runs-on: ubuntu-24.04
3131
timeout-minutes: 15
3232
environment:
3333
name: production

‎.github/workflows/desktop-macos-preview-publish.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@ jobs:
309309
clerk_cli_oauth_client_id: ${{ needs.resolve.outputs.clerk_cli_oauth_client_id }}
310310
relay_url: ${{ needs.resolve.outputs.relay_url }}
311311
label: macOS arm64 preview
312-
runner: blacksmith-12vcpu-macos-26
312+
runner: macos-26
313313
platform: mac
314314
target: dmg
315315
arch: arm64
@@ -326,7 +326,7 @@ jobs:
326326
name: Publish anonymous download
327327
needs: [resolve, build]
328328
if: needs.resolve.outputs.eligible == 'true' && needs.build.result == 'success'
329-
runs-on: blacksmith-8vcpu-ubuntu-2404
329+
runs-on: ubuntu-24.04
330330
timeout-minutes: 10
331331
# Its own group, so a publish never cancels a newer commit's signing job
332332
# (they would share the build group) and is never cancelled mid-upload.

‎.github/workflows/desktop-macos-preview.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
build:
3131
name: Build preview JS bundle
3232
if: github.event.label.name == 'preview:mac'
33-
runs-on: blacksmith-32vcpu-ubuntu-2404
33+
runs-on: ubuntu-24.04
3434
timeout-minutes: 30
3535
steps:
3636
# This repository is public, so Git needs no credentials. checkout's

‎.github/workflows/mobile-android-apk.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
mirror:
1717
name: Mirror beta APK
1818
if: github.repository == 'pingdotgg/t3code'
19-
runs-on: blacksmith-2vcpu-ubuntu-2404
19+
runs-on: ubuntu-24.04
2020
timeout-minutes: 10
2121
permissions:
2222
contents: write

‎.github/workflows/mobile-dev-client.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ jobs:
6161
android:
6262
name: Android ${{ matrix.abi }}
6363
if: github.repository == 'pingdotgg/t3code' && (github.event_name != 'workflow_dispatch' || inputs.platform == 'android')
64-
runs-on: blacksmith-32vcpu-ubuntu-2404
64+
runs-on: ubuntu-24.04
6565
timeout-minutes: 45
6666
strategy:
6767
fail-fast: false
@@ -144,7 +144,7 @@ jobs:
144144
# the runs holding the cache login restore.
145145
- name: Mount build cache
146146
if: github.event_name != 'pull_request'
147-
uses: useblacksmith/stickydisk@3f6be1451e3cad893b778bc93495c80452a5da26 # v1.7.2
147+
uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
148148
with:
149149
key: ${{ github.repository }}-android-dev-client-${{ matrix.abi }}
150150
path: ~/.cache/t3-android-dev-client
@@ -154,7 +154,7 @@ jobs:
154154
mkdir -p "$GRADLE_USER_HOME" "$CCACHE_DIR"
155155
# No daemon: nothing should hold the sticky disk open when it is committed.
156156
printf 'org.gradle.caching=true\norg.gradle.daemon=false\n' > "$GRADLE_USER_HOME/gradle.properties"
157-
sudo sed -i 's|http://|https://|g' /etc/apt/blacksmith-ubuntu-mirrors.txt /etc/apt/sources.list.d/ubuntu.sources
157+
sudo sed -i 's|http://|https://|g' /etc/apt/sources.list.d/ubuntu.sources
158158
sudo apt-get update -qq && sudo apt-get install -y -qq ccache
159159
ccache --zero-stats
160160
@@ -219,7 +219,7 @@ jobs:
219219
ios:
220220
name: iOS simulator
221221
if: github.repository == 'pingdotgg/t3code' && (github.event_name != 'workflow_dispatch' || inputs.platform == 'ios')
222-
runs-on: blacksmith-12vcpu-macos-27
222+
runs-on: xcode-27
223223
timeout-minutes: 60
224224
concurrency:
225225
group: mobile-dev-client-ios-${{ github.event_name == 'pull_request' && github.event.pull_request.number || inputs.fingerprint || github.sha }}

‎.github/workflows/mobile-eas-preview-fork.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
if: >-
2323
github.event.pull_request.head.repo.full_name != github.repository &&
2424
github.event.label.name == '🚀 Mobile Continuous Deployment'
25-
runs-on: blacksmith-8vcpu-ubuntu-2404
25+
runs-on: ubuntu-24.04
2626
concurrency:
2727
group: mobile-eas-preview-fork-${{ github.event.pull_request.number }}
2828
cancel-in-progress: true
@@ -235,7 +235,7 @@ jobs:
235235
name: Android preview client
236236
needs: preview
237237
if: needs.preview.outputs.build == 'true'
238-
runs-on: blacksmith-32vcpu-ubuntu-2404
238+
runs-on: ubuntu-24.04
239239
timeout-minutes: 60
240240
permissions:
241241
contents: read

‎.github/workflows/mobile-eas-preview.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
github.event.pull_request.head.repo.full_name == github.repository &&
1313
contains(github.event.pull_request.labels.*.name, '🚀 Mobile Continuous Deployment') &&
1414
(github.event.action != 'labeled' || github.event.label.name == '🚀 Mobile Continuous Deployment')
15-
runs-on: blacksmith-8vcpu-ubuntu-2404
15+
runs-on: ubuntu-24.04
1616
concurrency:
1717
group: mobile-eas-preview-${{ github.event.pull_request.number }}
1818
cancel-in-progress: true
@@ -124,7 +124,7 @@ jobs:
124124
github.event.pull_request.head.repo.full_name == github.repository &&
125125
contains(github.event.pull_request.labels.*.name, '🚀 Mobile Continuous Deployment') &&
126126
(github.event.action != 'labeled' || github.event.label.name == '🚀 Mobile Continuous Deployment')
127-
runs-on: blacksmith-8vcpu-ubuntu-2404
127+
runs-on: ubuntu-24.04
128128
concurrency:
129129
group: mobile-eas-preview-android-${{ github.event.pull_request.number }}
130130
cancel-in-progress: true
@@ -270,7 +270,7 @@ jobs:
270270
name: Android preview client
271271
needs: android
272272
if: needs.android.outputs.build == 'true'
273-
runs-on: blacksmith-32vcpu-ubuntu-2404
273+
runs-on: ubuntu-24.04
274274
timeout-minutes: 60
275275
concurrency:
276276
# One build per fingerprint; a second PR with the same one finds the tag.
@@ -349,7 +349,7 @@ jobs:
349349
350350
- name: Mount build cache
351351
if: steps.record.outputs.built != 'true'
352-
uses: useblacksmith/stickydisk@3f6be1451e3cad893b778bc93495c80452a5da26 # v1.7.2
352+
uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
353353
with:
354354
key: ${{ github.repository }}-android-preview-build
355355
path: ~/.cache/t3-android-preview
@@ -361,7 +361,7 @@ jobs:
361361
rm -rf "$EAS_LOCAL_BUILD_WORKINGDIR"
362362
# No daemon: nothing should hold the sticky disk open when it is committed.
363363
printf 'org.gradle.caching=true\norg.gradle.daemon=false\n' > "$GRADLE_USER_HOME/gradle.properties"
364-
sudo sed -i 's|http://|https://|g' /etc/apt/blacksmith-ubuntu-mirrors.txt /etc/apt/sources.list.d/ubuntu.sources
364+
sudo sed -i 's|http://|https://|g' /etc/apt/sources.list.d/ubuntu.sources
365365
sudo apt-get update -qq && sudo apt-get install -y -qq ccache
366366
ccache --zero-stats
367367

‎.github/workflows/mobile-eas-production.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ jobs:
7575
production:
7676
name: EAS ${{ inputs.profile || 'production' }} ${{ github.event_name == 'push' && 'auto' || inputs.mode }}
7777
if: github.repository == 'pingdotgg/t3code'
78-
runs-on: blacksmith-8vcpu-ubuntu-2404
78+
runs-on: ubuntu-24.04
7979
# Serialize runs so OTAs publish in merge order. GitHub keeps at most one
8080
# queued job per group, so a burst of merges collapses into one run of the
8181
# newest commit — intermediate commits don't need their own OTA.
@@ -484,7 +484,7 @@ jobs:
484484
needs: production
485485
# Skipped when the production job failed: no store build after a failed OTA.
486486
if: needs.production.outputs.android_build == 'true'
487-
runs-on: blacksmith-32vcpu-ubuntu-2404
487+
runs-on: ubuntu-24.04
488488
timeout-minutes: 60
489489
concurrency:
490490
group: mobile-android-store-build
@@ -551,7 +551,7 @@ jobs:
551551
552552
- name: Mount build cache
553553
if: steps.record.outputs.built != 'true'
554-
uses: useblacksmith/stickydisk@3f6be1451e3cad893b778bc93495c80452a5da26 # v1.7.2
554+
uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
555555
with:
556556
key: ${{ github.repository }}-android-store-build
557557
path: ~/.cache/t3-android-store
@@ -563,7 +563,7 @@ jobs:
563563
rm -rf "$EAS_LOCAL_BUILD_WORKINGDIR"
564564
# No daemon: nothing should hold the sticky disk open when it is committed.
565565
printf 'org.gradle.caching=true\norg.gradle.daemon=false\n' > "$GRADLE_USER_HOME/gradle.properties"
566-
sudo sed -i 's|http://|https://|g' /etc/apt/blacksmith-ubuntu-mirrors.txt /etc/apt/sources.list.d/ubuntu.sources
566+
sudo sed -i 's|http://|https://|g' /etc/apt/sources.list.d/ubuntu.sources
567567
sudo apt-get update -qq && sudo apt-get install -y -qq ccache
568568
ccache --zero-stats
569569
@@ -688,7 +688,7 @@ jobs:
688688
needs: production
689689
# Skipped when the production job failed: no store build after a failed OTA.
690690
if: needs.production.outputs.ios_build == 'true'
691-
runs-on: blacksmith-12vcpu-macos-27
691+
runs-on: xcode-27
692692
timeout-minutes: 60
693693
concurrency:
694694
group: mobile-ios-store-build

0 commit comments

Comments
 (0)