Skip to content

Commit 8d20bc8

Browse files
giarc3giarc3
authored
Remove buildjet, update CI (#146)
1 parent 3c8e78c commit 8d20bc8

File tree

7 files changed

+98
-97
lines changed

7 files changed

+98
-97
lines changed

‎.github/workflows/publish.yaml‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@ jobs:
3434
- os: macos-13
3535
target: x86_64-apple-darwin
3636
arch: x64
37-
- os: buildjet-2vcpu-ubuntu-2204
37+
- os: ubuntu-24.04
3838
target: x86_64-unknown-linux-gnu
3939
arch: x64
40-
- os: buildjet-4vcpu-ubuntu-2204-arm
40+
- os: ubuntu-24.04-arm
4141
target: aarch64-unknown-linux-gnu
4242
arch: arm64
4343
- os: windows-2025
@@ -47,7 +47,7 @@ jobs:
4747
target: aarch64-apple-darwin
4848
arch: arm64
4949
steps:
50-
- uses: actions/checkout@v4
50+
- uses: actions/checkout@v5
5151
with:
5252
ref: ${{ github.event.release.tag_name }}${{ github.event.inputs.name }}
5353
- uses: actions/setup-node@v4
@@ -89,13 +89,12 @@ jobs:
8989
# fail-fast: false
9090
# matrix:
9191
# node_version:
92-
# - 16
93-
# - 18
9492
# - 20
95-
# - 21
93+
# - 22
94+
# - 24
9695
# os:
97-
# - buildjet-2vcpu-ubuntu-2204
98-
# - buildjet-4vcpu-ubuntu-2204-arm
96+
# - ubuntu-24.04
97+
# - ubuntu-24.04-arm
9998
# steps:
10099
# - run: apk add build-base git python3 wget github-cli
101100
# # WORKAROUND
@@ -128,13 +127,13 @@ jobs:
128127
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
129128

130129
publish-npm:
131-
if: '${{ github.event.release.tag_name }}'
130+
if: "${{ github.event.release.tag_name }}"
132131
needs:
133132
- publish-github
134133
# - publish-github-docker
135134
runs-on: ubuntu-24.04
136135
steps:
137-
- uses: actions/checkout@v4
136+
- uses: actions/checkout@v5
138137
with:
139138
ref: ${{ github.event.release.tag_name }}
140139
- uses: actions/setup-node@v4

‎.github/workflows/rust-ci.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
name: Rust CI
2-
'on':
2+
on:
33
push:
44
branches:
5-
- main
6-
pull_request: null
7-
workflow_dispatch: null
5+
- main
6+
pull_request:
7+
workflow_dispatch:
88
schedule:
9-
- cron: 0 14 * * 1
9+
- cron: 0 14 * * 1
1010
jobs:
1111
rust-ci:
1212
uses: IronCoreLabs/workflows/.github/workflows/rust-ci.yaml@rust-ci-v2

‎.github/workflows/rust-daily.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ on:
66

77
jobs:
88
rust-daily:
9-
uses: IronCoreLabs/workflows/.github/workflows/rust-daily.yaml@rust-daily-v0
9+
uses: IronCoreLabs/workflows/.github/workflows/rust-daily.yaml@rust-daily-v1
1010
secrets: inherit

‎.github/workflows/typescript-napi-ci.yaml‎

Lines changed: 69 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ concurrency:
55
on:
66
push:
77
branches:
8-
- main
8+
- main
99
pull_request:
1010
workflow_dispatch:
1111
jobs:
@@ -14,80 +14,75 @@ jobs:
1414
strategy:
1515
matrix:
1616
rust_version:
17-
- stable
18-
- beta
17+
- stable
18+
# Uncomment after Rust 1.90.0 comes out: https://github.com/rust-lang/rust/issues/145699
19+
# - beta
1920
node_version:
20-
- 20
21-
- 22
22-
- 24
21+
- 20
22+
- 22
23+
- 24
2324
system:
24-
- os: macos-13
25-
target: x86_64-apple-darwin
26-
arch: x64
27-
- os: buildjet-2vcpu-ubuntu-2204
28-
target: x86_64-unknown-linux-gnu
29-
arch: x64
30-
- os: buildjet-4vcpu-ubuntu-2204-arm
31-
target: arm64-unknown-linux-gnu
32-
arch: arm64
33-
- os: windows-2025
34-
target: x86_64-pc-windows-msvc
35-
arch: x64
36-
- os: macos-14
37-
target: aarch64-apple-darwin
38-
arch: arm64
25+
- os: macos-13
26+
target: x86_64-apple-darwin
27+
arch: x64
28+
- os: ubuntu-24.04
29+
target: x86_64-unknown-linux-gnu
30+
arch: x64
31+
- os: ubuntu-24.04-arm
32+
target: arm64-unknown-linux-gnu
33+
arch: arm64
34+
- os: windows-2025
35+
target: x86_64-pc-windows-msvc
36+
arch: x64
37+
- os: macos-14
38+
target: aarch64-apple-darwin
39+
arch: arm64
3940
fail-fast: false
4041
steps:
41-
- uses: actions/checkout@v4
42-
- uses: actions/setup-node@v4
43-
with:
44-
node-version: ${{ matrix.node_version }}
45-
cache: yarn
46-
architecture: ${{ matrix.system.arch }}
47-
- uses: IronCoreLabs/rust-toolchain@v1
48-
with:
49-
toolchain: ${{ matrix.rust_version }}
50-
- name: Install modules
51-
run: yarn install --ignore-scripts
52-
- name: Compile
53-
run: yarn run compile
54-
- name: Run tests
55-
run: yarn run test
56-
57-
# broken now that node20 is forced even for checkout@v3, which doesn't work using the # WORKAROUND below any more.
58-
# test-docker:
59-
# runs-on: ${{ matrix.os }}
60-
# container:
61-
# image: node:${{ matrix.node_version }}-alpine
62-
# strategy:
63-
# matrix:
64-
# rust_version:
65-
# - stable
66-
# - beta
67-
# node_version:
68-
# - 16
69-
# - 18
70-
# - 20
71-
# - 21
72-
# os:
73-
# - buildjet-2vcpu-ubuntu-2204
74-
# - buildjet-4vcpu-ubuntu-2204-arm
75-
# fail-fast: false
76-
# steps:
77-
# - run: apk add build-base git python3 wget
78-
# # WORKAROUND
79-
# # https://github.com/actions/runner/issues/801#issuecomment-1374967227
80-
# - run: |
81-
# apk add gcompat
82-
# sed -i "s:ID=alpine:ID=NotpineForGHA:" /etc/os-release
83-
# - run: echo RUSTFLAGS="-C target-feature=-crt-static" >> "${GITHUB_ENV}"
84-
# - uses: actions/checkout@v4
85-
# - uses: IronCoreLabs/rust-toolchain@v1
86-
# with:
87-
# toolchain: ${{ matrix.rust_version }}
88-
# - name: Install modules
89-
# run: yarn install --ignore-scripts
90-
# - name: Compile
91-
# run: yarn run compile
92-
# - name: Run tests
93-
# run: yarn run test
42+
- uses: actions/checkout@v5
43+
- uses: actions/setup-node@v4
44+
with:
45+
node-version: ${{ matrix.node_version }}
46+
cache: yarn
47+
architecture: ${{ matrix.system.arch }}
48+
- uses: IronCoreLabs/rust-toolchain@v1
49+
with:
50+
toolchain: ${{ matrix.rust_version }}
51+
- name: Install modules
52+
run: yarn install --ignore-scripts
53+
- name: Compile
54+
run: yarn run compile
55+
- name: Run tests
56+
run: yarn run test
57+
58+
# broken now that node20 is forced even for checkout@v3, which doesn't work using the # WORKAROUND below any more.
59+
# test-docker:
60+
# runs-on: ${{ matrix.os }}
61+
# container:
62+
# image: node:${{ matrix.node_version }}-alpine
63+
# strategy:
64+
# matrix:
65+
# rust_version:
66+
# - stable
67+
# - beta
68+
# node_version:
69+
# - 20
70+
# - 22
71+
# - 24
72+
# os:
73+
# - ubuntu-24.04
74+
# - ubuntu-24.04-arm
75+
# fail-fast: false
76+
# steps:
77+
# - run: apk add build-base git python3 wget
78+
# - run: echo RUSTFLAGS="-C target-feature=-crt-static" >> "${GITHUB_ENV}"
79+
# - uses: actions/checkout@v5
80+
# - uses: IronCoreLabs/rust-toolchain@v1
81+
# with:
82+
# toolchain: ${{ matrix.rust_version }}
83+
# - name: Install modules
84+
# run: yarn install --ignore-scripts
85+
# - name: Compile
86+
# run: yarn run compile
87+
# - name: Run tests
88+
# run: yarn run test

‎flake.lock‎

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎rust-toolchain.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
[toolchain]
22
profile = "default"
3-
channel = "1.87.0"
3+
channel = "1.89.0"

‎yarn.lock‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1371,6 +1371,13 @@ fs-minipass@^2.0.0:
13711371
dependencies:
13721372
minipass "^3.0.0"
13731373

1374+
fs-minipass@^2.0.0:
1375+
version "2.1.0"
1376+
resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz#7f5036fdbf12c63c169190cbe4199c852271f9fb"
1377+
integrity sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==
1378+
dependencies:
1379+
minipass "^3.0.0"
1380+
13741381
fs.realpath@^1.0.0:
13751382
version "1.0.0"
13761383
resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"

0 commit comments

Comments
 (0)