Skip to content

Commit 424d78f

Browse files
committed
fix: ci problem
because cross-rs is based on ubuntu20.04, so it does not contains pipewire
1 parent f457c69 commit 424d78f

File tree

3 files changed

+6
-7
lines changed

3 files changed

+6
-7
lines changed

.github/workflows/platforms.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -94,10 +94,10 @@ jobs:
9494
run: cargo +${{ env.MSRV_ALSA }} check --examples --no-default-features --workspace --verbose
9595

9696
- name: Run tests (all features)
97-
run: cargo +${{ steps.msrv.outputs.all-features }} test --all-features --workspace --verbose
97+
run: cargo +${{ steps.msrv.outputs.all-features }} test --features=jack --workspace --verbose
9898

9999
- name: Check examples (all features)
100-
run: cargo +${{ steps.msrv.outputs.all-features }} check --examples --all-features --workspace --verbose
100+
run: cargo +${{ steps.msrv.outputs.all-features }} check --examples --features=jack --workspace --verbose
101101

102102
# Linux ARMv7 (cross-compilation)
103103
linux-armv7:
@@ -150,10 +150,10 @@ jobs:
150150
run: cross +${{ env.MSRV_ALSA }} test --no-default-features --workspace --verbose --target ${{ env.TARGET }}
151151

152152
- name: Run tests (all features)
153-
run: cross +${{ steps.msrv.outputs.all-features }} test --all-features --workspace --verbose --target ${{ env.TARGET }}
153+
run: cross +${{ steps.msrv.outputs.all-features }} test --features=jack --workspace --verbose --target ${{ env.TARGET }}
154154

155155
- name: Check examples (all features)
156-
run: cross +${{ steps.msrv.outputs.all-features }} test --all-features --workspace --verbose --target ${{ env.TARGET }}
156+
run: cross +${{ steps.msrv.outputs.all-features }} test --features=jack --workspace --verbose --target ${{ env.TARGET }}
157157

158158
# Windows (x86_64 and i686)
159159
windows:

Cross.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
[target.armv7-unknown-linux-gnueabihf]
22
dockerfile = "Dockerfile"
3-
build-args = { CROSS_BASE_IMAGE = "ubuntu:24.04" }
43

54
[target.armv7-unknown-linux-gnueabihf.env]
65
passthrough = ["RUSTFLAGS"]

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ ENV PKG_CONFIG_PATH=/usr/lib/arm-linux-gnueabihf/pkgconfig/
77
RUN dpkg --add-architecture armhf && \
88
apt-get update && \
99
apt-get install libasound2-dev:armhf -y && \
10-
apt-get install libjack-jackd2-dev:armhf libjack-jackd2-0:armhf -y && \
11-
apt-get install libpipewire-0.3-dev:armhf -y \
10+
apt-get install libjack-jackd2-dev:armhf libjack-jackd2-0:armhf -y
11+
# TODO: now the cross-rs is based on ubuntu:20.04, so it does not contain pipewire-0.3-dev

0 commit comments

Comments
 (0)