Skip to content

Commit dd1a265

Browse files
author
Maxime LUCE
committed
ci: use cross
1 parent 341f85e commit dd1a265

2 files changed

Lines changed: 44 additions & 16 deletions

File tree

.github/workflows/CI.yml

Lines changed: 27 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ jobs:
2929
runs-on: ubuntu-latest
3030
steps:
3131
- uses: actions/checkout@v6
32+
- name: install system deps
33+
run: sudo apt install libasound2-dev libpulse-dev
3234
- name: setup pnpm
3335
uses: pnpm/action-setup@v4
3436
- name: Setup node
@@ -64,22 +66,22 @@ jobs:
6466
target: i686-pc-windows-msvc
6567
- host: ubuntu-latest
6668
target: x86_64-unknown-linux-gnu
67-
build: pnpm build --target x86_64-unknown-linux-gnu --use-napi-cross
69+
build: pnpm build --target x86_64-unknown-linux-gnu
6870
- host: ubuntu-latest
6971
target: x86_64-unknown-linux-musl
70-
build: pnpm build --target x86_64-unknown-linux-musl -x
72+
build: pnpm build --target x86_64-unknown-linux-musl --use-cross
7173
- host: macos-latest
7274
target: aarch64-apple-darwin
7375
build: pnpm build --target aarch64-apple-darwin
74-
- host: ubuntu-latest
76+
- host: ubuntu-24.04-arm
7577
target: aarch64-unknown-linux-gnu
76-
build: pnpm build --target aarch64-unknown-linux-gnu --use-napi-cross
78+
build: pnpm build --target aarch64-unknown-linux-gnu
7779
- host: ubuntu-latest
7880
target: armv7-unknown-linux-gnueabihf
79-
build: pnpm build --target armv7-unknown-linux-gnueabihf --use-napi-cross
81+
build: pnpm build --target armv7-unknown-linux-gnueabihf --use-cross
8082
- host: ubuntu-latest
8183
target: aarch64-unknown-linux-musl
82-
build: pnpm build --target aarch64-unknown-linux-musl -x
84+
build: pnpm build --target aarch64-unknown-linux-musl --use-cross
8385
- host: windows-latest
8486
target: aarch64-pc-windows-msvc
8587
build: pnpm build --target aarch64-pc-windows-msvc
@@ -110,20 +112,29 @@ jobs:
110112
.cargo-cache
111113
target/
112114
key: ${{ matrix.settings.target }}-cargo-${{ matrix.settings.host }}
113-
- uses: mlugg/setup-zig@v2
114-
if: ${{ contains(matrix.settings.target, 'musl') }}
115-
with:
116-
version: 0.15.2
117-
- name: Install cargo-zigbuild
115+
# - uses: mlugg/setup-zig@v2
116+
# if: ${{ contains(matrix.settings.target, 'musl') }}
117+
# with:
118+
# version: 0.15.2
119+
# - name: Install cargo-zigbuild
120+
# uses: taiki-e/install-action@v2
121+
# if: ${{ contains(matrix.settings.target, 'musl') }}
122+
# env:
123+
# GITHUB_TOKEN: ${{ github.token }}
124+
# with:
125+
# tool: cargo-zigbuild
126+
- name: Install cross
118127
uses: taiki-e/install-action@v2
119-
if: ${{ contains(matrix.settings.target, 'musl') }}
128+
if: ${{ contains(matrix.settings.build, '--use-cross') }}
120129
env:
121130
GITHUB_TOKEN: ${{ github.token }}
122131
with:
123-
tool: cargo-zigbuild
124-
- name: Install libasound2-dev
125-
run: sudo apt install libasound2-dev
126-
if: ${{ contains(matrix.settings.target, 'linux') }}
132+
tool: cross
133+
- name: Install libasound / libpulse
134+
run: |
135+
sudo apt update
136+
sudo apt install libasound2-dev libpulse-dev
137+
if: ${{ matrix.settings.target == 'x86_64-unknown-linux-gnu' || matrix.settings.target == 'aarch64-unknown-linux-gnu' }}
127138
- name: Setup toolchain
128139
run: ${{ matrix.settings.setup }}
129140
if: ${{ matrix.settings.setup }}

Cargo.toml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,20 @@ napi-build = "2"
1919
lto = true
2020
codegen-units = 1
2121
strip = "symbols"
22+
23+
[package.metadata.cross.target.x86_64-unknown-linux-musl]
24+
pre-build = [
25+
"apt-get update && apt-get --assume-yes install libasound2-dev libpulse-dev",
26+
]
27+
28+
[package.metadata.cross.target.armv7-unknown-linux-gnueabihf]
29+
pre-build = [
30+
"dpkg --add-architecture $CROSS_DEB_ARCH",
31+
"apt-get update && apt-get --assume-yes install libasound2-dev:$CROSS_DEB_ARCH libpulse-dev:$CROSS_DEB_ARCH",
32+
]
33+
34+
[package.metadata.cross.target.aarch64-unknown-linux-musl]
35+
pre-build = [
36+
"dpkg --add-architecture arm64",
37+
"apt-get update && apt-get --assume-yes install libasound2-dev:arm64 libpulse-dev:arm64",
38+
]

0 commit comments

Comments
 (0)