Skip to content

Commit b37bd70

Browse files
committed
fix: ci
1 parent 216813a commit b37bd70

File tree

1 file changed

+12
-10
lines changed

1 file changed

+12
-10
lines changed

.github/workflows/CI.yml

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757
uses: pnpm/action-setup@v4
5858
with:
5959
run_install: true
60-
- name: Install
60+
- name: Install Rust
6161
uses: dtolnay/rust-toolchain@stable
6262
with:
6363
components: clippy, rustfmt
@@ -82,19 +82,19 @@ jobs:
8282
- host: [self-hosted, windows, x64]
8383
build: pnpm build --target i686-pc-windows-msvc
8484
target: i686-pc-windows-msvc
85-
- host: [self-hosted, linux, ARM]
85+
- host: [self-hosted, linux, x64]
8686
target: x86_64-unknown-linux-gnu
8787
build: pnpm build --target x86_64-unknown-linux-gnu --use-napi-cross
88-
- host: [self-hosted, linux, ARM]
88+
- host: [self-hosted, linux, x64]
8989
target: x86_64-unknown-linux-musl
9090
build: pnpm build --target x86_64-unknown-linux-musl -x
9191
- host: [self-hosted, macos]
9292
target: aarch64-apple-darwin
9393
build: pnpm build --target aarch64-apple-darwin
94-
- host: [self-hosted, linux, ARM]
94+
- host: [self-hosted, linux, x64]
9595
target: aarch64-unknown-linux-gnu
9696
build: pnpm build --target aarch64-unknown-linux-gnu --use-napi-cross
97-
- host: [self-hosted, linux, ARM]
97+
- host: [self-hosted, linux, x64]
9898
target: armv7-unknown-linux-gnueabihf
9999
build: pnpm build --target armv7-unknown-linux-gnueabihf --use-napi-cross
100100
- host: [self-hosted, linux, ARM]
@@ -268,7 +268,7 @@ jobs:
268268
runs-on:
269269
- self-hosted
270270
- linux
271-
- ARM
271+
- ${{ contains(matrix.target, 'armv7') && 'x64' || (contains(matrix.target, 'x86_64') && 'x64' || 'arm64') }}
272272
steps:
273273
- name: Clean workspace (Linux/macOS)
274274
if: runner.os != 'Windows'
@@ -312,10 +312,8 @@ jobs:
312312
node -e "
313313
if ('${{ matrix.target }}'.endsWith('-musl')) {
314314
console.log('IMAGE=node:${{ matrix.node }}-alpine')
315-
} else if ('${{ matrix.target }}' === 'x86_64-unknown-linux-gnu') {
316-
console.log('IMAGE=node:${{ matrix.node }}-bookworm')
317315
} else {
318-
console.log('IMAGE=node:${{ matrix.node }}-slim')
316+
console.log('IMAGE=node:${{ matrix.node }}-bullseye')
319317
}
320318
" >> $GITHUB_OUTPUT
321319
echo "PNPM_STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_OUTPUT
@@ -337,7 +335,11 @@ jobs:
337335
with:
338336
image: ${{ steps.docker.outputs.IMAGE }}
339337
options: -v ${{ steps.docker.outputs.PNPM_STORE_PATH }}:${{ steps.docker.outputs.PNPM_STORE_PATH }} -v ${{ github.workspace }}:${{ github.workspace }} -w ${{ github.workspace }} --platform ${{ steps.docker.outputs.PLATFORM }}
340-
run: npm run test
338+
run: |
339+
if ! echo "${{ steps.docker.outputs.IMAGE }}" | grep -q alpine; then
340+
apt-get update && apt-get install -y libc6-dev
341+
fi
342+
npm run test
341343
342344
publish:
343345
name: Publish

0 commit comments

Comments
 (0)