Skip to content

Commit 52d515c

Browse files
authored
Revert "chore: Migrate workflows to Blacksmith" (#3230)
1 parent 97dde0b commit 52d515c

File tree

12 files changed

+38
-38
lines changed

12 files changed

+38
-38
lines changed

.github/workflows/benchmark_comment.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
jobs:
1010
macro_benchmarks_comment:
1111
name: Benchmark comment on commit
12-
runs-on: blacksmith-4vcpu-ubuntu-2204
12+
runs-on: ubuntu-latest
1313
if: >
1414
github.event.workflow_run.conclusion == 'success'
1515
steps:

.github/workflows/benchmark_pr_track.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ concurrency:
1212
jobs:
1313
micro_benchmarks_pr_track:
1414
if: github.event.workflow_run.conclusion == 'success'
15-
runs-on: blacksmith-4vcpu-ubuntu-2204
15+
runs-on: ubuntu-latest
1616
env:
1717
BENCHMARK_RESULTS: benchmark_results.txt
1818
PR_EVENT: event.json

.github/workflows/build-website.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_website:
10-
runs-on: blacksmith-4vcpu-ubuntu-2204
10+
runs-on: ubuntu-latest
1111
steps:
1212
- name: Build website
1313
env:

.github/workflows/build_matrix.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
# IMPORTANT: in case of changing the structure of this file make sure to test
1111
# the changes against `npm/gen-root.ts` file
1212
setup-matrix:
13-
runs-on: blacksmith-4vcpu-ubuntu-2204
13+
runs-on: ubuntu-latest
1414
outputs:
1515
matrix: ${{ steps.setup-matrix.outputs.matrix }}
1616
steps:
@@ -33,34 +33,34 @@ jobs:
3333
]
3434
include:
3535
- build: linux-x64-gnu
36-
os: blacksmith-4vcpu-ubuntu-2204
36+
os: ubuntu-latest
3737
rust: stable
3838
target: x86_64-unknown-linux-gnu
3939
libc: glibc
4040
4141
- build: linux-x64-musl
42-
os: blacksmith-4vcpu-ubuntu-2204
42+
os: ubuntu-latest
4343
rust: stable
4444
target: x86_64-unknown-linux-musl
4545
libc: musl
4646
cross: true
4747
4848
- build: linux-arm64-gnu
49-
os: blacksmith-4vcpu-ubuntu-2204
49+
os: ubuntu-latest
5050
rust: stable
5151
target: aarch64-unknown-linux-gnu
5252
libc: glibc
5353
cross: true
5454
5555
- build: linux-arm64-musl
56-
os: blacksmith-4vcpu-ubuntu-2204
56+
os: ubuntu-latest
5757
rust: stable
5858
target: aarch64-unknown-linux-musl
5959
libc: musl
6060
cross: true
6161
6262
- build: linux-ia32-gnu
63-
os: blacksmith-4vcpu-ubuntu-2204
63+
os: ubuntu-latest
6464
rust: stable
6565
target: i686-unknown-linux-gnu
6666
libc: glibc

.github/workflows/ci.yml

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424

2525
check_if_build:
2626
name: Check if Build
27-
runs-on: blacksmith-4vcpu-ubuntu-2204
27+
runs-on: ubuntu-latest
2828

2929
steps:
3030
- uses: actions/checkout@v4
@@ -40,7 +40,7 @@ jobs:
4040
test_aws_build:
4141
name: Test AWS Lambda Build
4242
if: github.event_name == 'pull_request'
43-
runs-on: blacksmith-4vcpu-ubuntu-2204
43+
runs-on: ubuntu-latest
4444
defaults:
4545
run:
4646
working-directory: ./tailcall-aws-lambda
@@ -52,7 +52,7 @@ jobs:
5252
uses: actions-rust-lang/setup-rust-toolchain@v1
5353

5454
- name: Install Python
55-
uses: useblacksmith/setup-python@v6
55+
uses: actions/setup-python@v5
5656
with:
5757
python-version: "3.12"
5858

@@ -64,7 +64,7 @@ jobs:
6464

6565
test_wasm:
6666
name: Run Tests (WASM)
67-
runs-on: blacksmith-4vcpu-ubuntu-2204
67+
runs-on: ubuntu-latest
6868
defaults:
6969
run:
7070
working-directory: ./tailcall-wasm
@@ -76,7 +76,7 @@ jobs:
7676
target: wasm32-unknown-unknown
7777

7878
- name: Install Node.js
79-
uses: useblacksmith/setup-node@v5
79+
uses: actions/setup-node@v4
8080
with:
8181
node-version: "20.11.0"
8282

@@ -90,7 +90,7 @@ jobs:
9090
9191
test_cf:
9292
name: Run Tests (Cloudflare)
93-
runs-on: blacksmith-4vcpu-ubuntu-2204
93+
runs-on: ubuntu-latest
9494
defaults:
9595
run:
9696
working-directory: ./tailcall-cloudflare
@@ -104,7 +104,7 @@ jobs:
104104
target: wasm32-unknown-unknown
105105

106106
- name: Install Node.js
107-
uses: useblacksmith/setup-node@v5
107+
uses: actions/setup-node@v4
108108
with:
109109
node-version: "20.11.0"
110110

@@ -116,7 +116,7 @@ jobs:
116116

117117
test:
118118
name: Run Tests on ${{ matrix.build }}
119-
runs-on: ${{ matrix.os || 'blacksmith-4vcpu-ubuntu-2204' }}
119+
runs-on: ${{ matrix.os || 'ubuntu-latest' }}
120120
needs: setup_build_matrix
121121
strategy:
122122
fail-fast: false
@@ -129,7 +129,7 @@ jobs:
129129
- uses: actions/checkout@v4
130130

131131
- name: Install Node.js
132-
uses: useblacksmith/setup-node@v5
132+
uses: actions/setup-node@v4
133133
with:
134134
node-version: "20.11.0"
135135
- name: Install Prettier
@@ -145,7 +145,7 @@ jobs:
145145

146146
- name: Cache NASM
147147
if: runner.os == 'Windows'
148-
uses: useblacksmith/cache@v5
148+
uses: actions/cache@v4
149149
with:
150150
path: |
151151
nasm-2.16.02
@@ -201,7 +201,7 @@ jobs:
201201
202202
check-examples:
203203
name: Check Examples
204-
runs-on: blacksmith-4vcpu-ubuntu-2204
204+
runs-on: ubuntu-latest
205205
steps:
206206
- uses: actions/checkout@v4
207207
- name: Set up Rust
@@ -223,7 +223,7 @@ jobs:
223223
draft_release:
224224
name: Draft Release
225225
if: github.event_name == 'push' && github.ref == 'refs/heads/main'
226-
runs-on: blacksmith-4vcpu-ubuntu-2204
226+
runs-on: ubuntu-latest
227227
permissions:
228228
contents: write
229229
pull-requests: write
@@ -253,7 +253,7 @@ jobs:
253253
needs: [setup_build_matrix, test, draft_release, check_if_build, test_cf, test_wasm]
254254
# TODO: put a condition to separate job that other will depend on to remove duplication?
255255
if: github.event_name == 'push' && github.ref == 'refs/heads/main' && (needs.check_if_build.outputs.check_if_build == 'true')
256-
runs-on: ${{ matrix.os || 'blacksmith-4vcpu-ubuntu-2204' }}
256+
runs-on: ${{ matrix.os || 'ubuntu-latest' }}
257257
strategy:
258258
fail-fast: false
259259
matrix: ${{ fromJson(needs.setup_build_matrix.outputs.matrix) }}
@@ -288,7 +288,7 @@ jobs:
288288

289289
- name: Install Node.js
290290
if: (startsWith(github.event.head_commit.message, 'feat') || startsWith(github.event.head_commit.message, 'fix')) && (github.event_name == 'push' && github.ref == 'refs/heads/main')
291-
uses: useblacksmith/setup-node@v5
291+
uses: actions/setup-node@v4
292292
with:
293293
node-version: 20.11.0
294294
registry-url: https://registry.npmjs.org
@@ -332,7 +332,7 @@ jobs:
332332
name: Release (AWS Lambda)
333333
needs: [test, draft_release, check_if_build, test_cf]
334334
if: github.event_name == 'push' && github.ref == 'refs/heads/main' && (needs.check_if_build.outputs.check_if_build == 'true')
335-
runs-on: blacksmith-4vcpu-ubuntu-2204
335+
runs-on: ubuntu-latest
336336
permissions:
337337
contents: write
338338
pull-requests: write
@@ -348,7 +348,7 @@ jobs:
348348
uses: actions-rust-lang/setup-rust-toolchain@v1
349349

350350
- name: Install Python
351-
uses: useblacksmith/setup-python@v6
351+
uses: actions/setup-python@v5
352352
with:
353353
python-version: "3.12"
354354

@@ -376,7 +376,7 @@ jobs:
376376
name: Semantic Release
377377
if: (startsWith(github.event.head_commit.message, 'feat') || startsWith(github.event.head_commit.message, 'fix')) && (github.event_name == 'push' && github.ref == 'refs/heads/main')
378378
needs: [draft_release, release, release_lambda]
379-
runs-on: blacksmith-4vcpu-ubuntu-2204
379+
runs-on: ubuntu-latest
380380
permissions:
381381
contents: write
382382
pull-requests: write
@@ -396,12 +396,12 @@ jobs:
396396
name: Publish NPM main package
397397
needs: [draft_release, release]
398398
if: (startsWith(github.event.head_commit.message, 'feat') || startsWith(github.event.head_commit.message, 'fix')) && (github.event_name == 'push' && github.ref == 'refs/heads/main')
399-
runs-on: blacksmith-4vcpu-ubuntu-2204
399+
runs-on: ubuntu-latest
400400
steps:
401401
- name: Checkout Current Branch (Fast)
402402
uses: actions/checkout@v4
403403
- name: Install Node
404-
uses: useblacksmith/setup-node@v5
404+
uses: actions/setup-node@v4
405405
with:
406406
node-version: 20.11.0
407407
registry-url: https://registry.npmjs.org
@@ -441,7 +441,7 @@ jobs:
441441
APP_VERSION: ${{ needs.draft_release.outputs.create_release_name }} # Ensure APP_VERSION is set correctly
442442
needs: [draft_release, release]
443443
if: (startsWith(github.event.head_commit.message, 'feat') || startsWith(github.event.head_commit.message, 'fix')) && (github.event_name == 'push' && github.ref == 'refs/heads/main')
444-
runs-on: blacksmith-4vcpu-ubuntu-2204
444+
runs-on: ubuntu-latest
445445
# Sets the permissions granted to the `GITHUB_TOKEN` for the actions in this job.
446446
permissions:
447447
contents: read
@@ -484,7 +484,7 @@ jobs:
484484
permissions:
485485
contents: write
486486
pull-requests: write
487-
runs-on: blacksmith-4vcpu-ubuntu-2204
487+
runs-on: ubuntu-latest
488488
steps:
489489
- uses: actions/checkout@v4
490490
with:

.github/workflows/labels.yml

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

1010
jobs:
1111
label-sync:
12-
runs-on: blacksmith-4vcpu-ubuntu-2204
12+
runs-on: ubuntu-latest
1313
steps:
1414
- name: Checkout
1515
uses: actions/checkout@v4

.github/workflows/lint.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ concurrency:
1717
jobs:
1818
lint:
1919
name: Run Formatter and Lint Check
20-
runs-on: blacksmith-4vcpu-ubuntu-2204
20+
runs-on: ubuntu-latest
2121
permissions:
2222
pull-requests: write
2323
contents: write
@@ -26,7 +26,7 @@ jobs:
2626
steps:
2727
- uses: actions/checkout@v4
2828
- name: Install Node.js
29-
uses: useblacksmith/setup-node@v5
29+
uses: actions/setup-node@v4
3030
with:
3131
node-version: "20.11.0"
3232
- name: Install Prettier

.github/workflows/pr-convention.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ permissions:
1212
jobs:
1313
title-check:
1414
name: Check PR Title
15-
runs-on: blacksmith-4vcpu-ubuntu-2204
15+
runs-on: ubuntu-latest
1616
steps:
1717
- name: All PRs
1818
uses: amannn/action-semantic-pull-request@v5

.github/workflows/release-drafter.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
permissions:
1919
contents: write
2020
pull-requests: write
21-
runs-on: blacksmith-4vcpu-ubuntu-2204
21+
runs-on: ubuntu-latest
2222
steps:
2323
- uses: release-drafter/release-drafter@v6
2424
env:

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77
jobs:
88
deploy:
99
name: Deploy App
10-
runs-on: blacksmith-4vcpu-ubuntu-2204
10+
runs-on: ubuntu-latest
1111
concurrency:
1212
group: deploy-job
1313
cancel-in-progress: true

0 commit comments

Comments
 (0)