Skip to content

Commit dd39de4

Browse files
giarc3giarc3
committed
Remove buildjet, update CI
1 parent baf5050 commit dd39de4

File tree

5 files changed

+254
-169
lines changed

5 files changed

+254
-169
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: 66 additions & 73 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,73 @@ jobs:
1414
strategy:
1515
matrix:
1616
rust_version:
17-
- stable
18-
- beta
17+
- stable
18+
- beta
1919
node_version:
20-
- 20
21-
- 22
22-
- 24
20+
- 20
21+
- 22
22+
- 24
2323
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
24+
- os: macos-13
25+
target: x86_64-apple-darwin
26+
arch: x64
27+
- os: ubuntu-24.04
28+
target: x86_64-unknown-linux-gnu
29+
arch: x64
30+
- os: ubuntu-24.04-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
3939
fail-fast: false
4040
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
41+
- uses: actions/checkout@v5
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
5656

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
57+
test-docker:
58+
runs-on: ${{ matrix.os }}
59+
container:
60+
image: node:${{ matrix.node_version }}-alpine
61+
strategy:
62+
matrix:
63+
rust_version:
64+
- stable
65+
- beta
66+
node_version:
67+
- 20
68+
- 22
69+
- 24
70+
os:
71+
- ubuntu-24.04
72+
- ubuntu-24.04-arm
73+
fail-fast: false
74+
steps:
75+
- run: apk add build-base git python3 wget
76+
- run: echo RUSTFLAGS="-C target-feature=-crt-static" >> "${GITHUB_ENV}"
77+
- uses: actions/checkout@v5
78+
- uses: IronCoreLabs/rust-toolchain@v1
79+
with:
80+
toolchain: ${{ matrix.rust_version }}
81+
- name: Install modules
82+
run: yarn install --ignore-scripts
83+
- name: Compile
84+
run: yarn run compile
85+
- name: Run tests
86+
run: yarn run test

0 commit comments

Comments
 (0)