Skip to content

Commit 137c097

Browse files
committed
use cargo-cross for Linux GNU targets
1 parent d96cb72 commit 137c097

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

.github/workflows/node-js-packaging.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
target: i686-pc-windows-msvc
5050
- host: ubuntu-latest
5151
target: x86_64-unknown-linux-gnu
52-
build: yarn build --target x86_64-unknown-linux-gnu -x --features openssl-vendored
52+
build: yarn build --target x86_64-unknown-linux-gnu --use-cross --features openssl-vendored
5353
- host: ubuntu-latest
5454
target: x86_64-unknown-linux-musl
5555
build: yarn build --target x86_64-unknown-linux-musl -x --features openssl-vendored
@@ -58,10 +58,10 @@ jobs:
5858
build: yarn build --target aarch64-apple-darwin --features openssl-vendored
5959
- host: ubuntu-latest
6060
target: aarch64-unknown-linux-gnu
61-
build: yarn build --target aarch64-unknown-linux-gnu --use-napi-cross --features openssl-vendored
61+
build: yarn build --target aarch64-unknown-linux-gnu --use-cross --features openssl-vendored
6262
- host: ubuntu-latest
6363
target: armv7-unknown-linux-gnueabihf
64-
build: yarn build --target armv7-unknown-linux-gnueabihf --use-napi-cross --features openssl-vendored
64+
build: yarn build --target armv7-unknown-linux-gnueabihf --use-cross --features openssl-vendored
6565
- host: ubuntu-latest
6666
target: aarch64-unknown-linux-musl
6767
build: yarn build --target aarch64-unknown-linux-musl -x --features openssl-vendored
@@ -97,13 +97,13 @@ jobs:
9797
if: ${{ contains(matrix.settings.build, ' -x ') }}
9898
with:
9999
version: 0.14.1
100-
- name: Install cargo-zigbuild
100+
- name: Install ${{contains(matrix.settings.build, ' -x ') && 'cargo-zigbuild' || 'cargo-cross'}}
101101
uses: taiki-e/install-action@v2
102102
if: contains(matrix.settings.build, ' -x ') || contains(matrix.settings.build, '--use-cross ')
103103
env:
104104
GITHUB_TOKEN: ${{ github.token }}
105105
with:
106-
tool: ${{contains(matrix.settings.build, ' -x ') && 'cargo-zigbuild' || 'cargo-cross'}}
106+
tool: ${{contains(matrix.settings.build, ' -x ') && 'cargo-zigbuild' || 'cross'}}
107107
- name: Setup toolchain
108108
run: ${{ matrix.settings.setup }}
109109
if: ${{ matrix.settings.setup }}

0 commit comments

Comments
 (0)