Skip to content

Commit 5c1b0db

Browse files
HEnquistHEnquist
authored
Merge pull request #261 from HEnquist/next20
Version 2.0
2 parents 90b0bbe + ce710fa commit 5c1b0db

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+10293
-3816
lines changed

‎.github/workflows/ci_test.yml

+73-100
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
#container: ubuntu:20.04
1010
steps:
1111
- name: Checkout sources
12-
uses: actions/checkout@v2
12+
uses: actions/checkout@v3
1313

1414
- name: Update package list
1515
run: sudo apt-get update
@@ -18,11 +18,8 @@ jobs:
1818
run: sudo apt-get install curl wget -y
1919

2020
- name: Install stable toolchain
21-
uses: actions-rs/toolchain@v1
21+
uses: dtolnay/rust-toolchain@stable
2222
with:
23-
profile: minimal
24-
toolchain: stable
25-
override: true
2623
components: rustfmt, clippy
2724

2825
- name: Install Alsa devel
@@ -31,181 +28,157 @@ jobs:
3128
- name: Install PulseAudio
3229
run: DEBIAN_FRONTEND="noninteractive" sudo apt-get install libpulse0 libpulse-dev -y
3330

31+
- name: Install Jack
32+
run: DEBIAN_FRONTEND="noninteractive" sudo apt-get install libjack-dev -y
33+
3434
- name: Install OpenSSL
3535
run: sudo apt-get install openssl libssl-dev -y
3636

3737
- name: Run cargo check
38-
uses: actions-rs/cargo@v1
39-
with:
40-
command: check
38+
run: cargo check
4139

4240
- name: Run cargo check nodefault
43-
uses: actions-rs/cargo@v1
44-
with:
45-
command: check
46-
args: --no-default-features
41+
run: cargo check --no-default-features
4742

48-
- name: Run cargo test with pulse-backend
49-
uses: actions-rs/cargo@v1
50-
with:
51-
command: test
52-
args: --features pulse-backend
43+
- name: Run cargo test with all supported backends
44+
run: cargo test --features bluez-backend,cpal-backend,jack-backend,pulse-backend,
45+
46+
- name: Run cargo test with all optional features
47+
run: cargo test --features 32bit,debug,fftw,secure-websocket
5348

5449
- name: Run cargo fmt
55-
uses: actions-rs/cargo@v1
56-
with:
57-
command: fmt
58-
args: --all -- --check
50+
run: cargo fmt --all -- --check
5951

6052
- name: Run cargo clippy
61-
uses: actions-rs/cargo@v1
62-
with:
63-
command: clippy
64-
args: -- -D warnings
65-
66-
53+
run: cargo clippy -- -D warnings
6754

6855
check_test_arm:
6956
name: Check and test Linux arm
7057
runs-on: ubuntu-latest
7158
steps:
7259
- name: Checkout sources
73-
uses: actions/checkout@v2
60+
uses: actions/checkout@v3
7461

7562
- name: Install stable toolchain
76-
uses: actions-rs/toolchain@v1
63+
uses: dtolnay/rust-toolchain@stable
7764
with:
78-
profile: minimal
79-
toolchain: stable
80-
target: armv7-unknown-linux-gnueabihf
81-
override: true
65+
targets: armv7-unknown-linux-gnueabihf
66+
67+
- name: Install cross
68+
run: cargo install cross --git https://github.com/cross-rs/cross
8269

8370
- name: Build image
8471
run: docker build -t cross/armv7:v1 --file Dockerfile_armv7 ./
8572

8673
- name: Run cargo check
87-
uses: actions-rs/cargo@v1
88-
with:
89-
command: check
90-
use-cross: true
91-
args: --target armv7-unknown-linux-gnueabihf
74+
run: cross check --target armv7-unknown-linux-gnueabihf
9275

9376
- name: Run cargo test for arm
94-
uses: actions-rs/cargo@v1
95-
with:
96-
command: test
97-
use-cross: true
98-
args: --target armv7-unknown-linux-gnueabihf
77+
run: cross test --target armv7-unknown-linux-gnueabihf
9978

10079
check_test_arm64:
10180
name: Check and test Linux arm 64bit
10281
runs-on: ubuntu-latest
10382
steps:
10483
- name: Checkout sources
105-
uses: actions/checkout@v2
84+
uses: actions/checkout@v3
10685

10786
- name: Install stable toolchain
108-
uses: actions-rs/toolchain@v1
87+
uses: dtolnay/rust-toolchain@stable
10988
with:
110-
profile: minimal
111-
toolchain: stable
112-
target: aarch64-unknown-linux-gnu
113-
override: true
89+
targets: aarch64-unknown-linux-gnu
90+
91+
- name: Install cross
92+
run: cargo install cross --git https://github.com/cross-rs/cross
11493

11594
- name: Build image
11695
run: docker build -t cross/armv8:v1 --file Dockerfile_armv8 ./
11796

11897
- name: Run cargo check
119-
uses: actions-rs/cargo@v1
120-
with:
121-
command: check
122-
use-cross: true
123-
args: --target aarch64-unknown-linux-gnu
98+
run: cross check --target aarch64-unknown-linux-gnu
12499

125100
- name: Run cargo test for arm
126-
uses: actions-rs/cargo@v1
101+
run: cross test --target aarch64-unknown-linux-gnu
102+
103+
check_test_armv6:
104+
name: Check and test Linux arm v6
105+
runs-on: ubuntu-latest
106+
steps:
107+
- name: Checkout sources
108+
uses: actions/checkout@v3
109+
110+
- name: Install stable toolchain
111+
uses: dtolnay/rust-toolchain@stable
127112
with:
128-
command: test
129-
use-cross: true
130-
args: --target aarch64-unknown-linux-gnu
113+
targets: arm-unknown-linux-gnueabihf
114+
115+
- name: Install cross
116+
run: cargo install cross --git https://github.com/cross-rs/cross
131117

118+
- name: Build image
119+
run: docker build -t cross/armv6:v1 --file Dockerfile_armv6 ./
120+
121+
- name: Run cargo check
122+
run: cross check --target arm-unknown-linux-gnueabihf
123+
124+
- name: Run cargo test for arm
125+
run: cross test --target arm-unknown-linux-gnueabihf
126+
env:
127+
LD_LIBRARY_PATH: /usr/lib/arm-linux-gnueabihf
132128

133129
check_test_windows:
134130
name: Check and test Windows
135131
runs-on: windows-latest
136132
steps:
137133
- name: Checkout sources
138-
uses: actions/checkout@v2
134+
uses: actions/checkout@v3
139135

140136
- name: Install stable toolchain
141-
uses: actions-rs/toolchain@v1
142-
with:
143-
profile: minimal
144-
toolchain: stable
145-
override: true
137+
uses: dtolnay/rust-toolchain@stable
146138

147139
- name: Run cargo check
148-
uses: actions-rs/cargo@v1
149-
with:
150-
command: check
151-
args: --no-default-features
140+
run: cargo check --no-default-features
152141

153142
- name: Run cargo test
154-
uses: actions-rs/cargo@v1
155-
with:
156-
command: test
157-
args: --no-default-features
143+
run: cargo test --no-default-features
158144

159145
check_test_macos:
160146
name: Check and test macOS
161147
runs-on: macos-latest
162148
steps:
163149
- name: Checkout sources
164-
uses: actions/checkout@v2
150+
uses: actions/checkout@v3
165151

166152
- name: Install stable toolchain
167-
uses: actions-rs/toolchain@v1
168-
with:
169-
profile: minimal
170-
toolchain: stable
171-
override: true
153+
uses: dtolnay/rust-toolchain@stable
172154

173155
- name: Run cargo check
174-
uses: actions-rs/cargo@v1
175-
with:
176-
command: check
156+
run: cargo check --no-default-features
177157

178158
- name: Run cargo test
179-
uses: actions-rs/cargo@v1
180-
with:
181-
command: test
182-
159+
run: cargo test --no-default-features
183160

184161
check_macos_arm:
185162
name: Check macOS aarch64
186163
runs-on: macos-latest
187164
steps:
188165
- name: Checkout sources
189-
uses: actions/checkout@v2
166+
uses: actions/checkout@v3
190167

191-
- name: Install stable toolchain for arm
192-
uses: actions-rs/toolchain@v1
168+
- name: Install stable toolchain
169+
uses: dtolnay/rust-toolchain@stable
193170
with:
194-
profile: minimal
195-
toolchain: stable
196-
override: true
197-
target: aarch64-apple-darwin
171+
targets: aarch64-apple-darwin
172+
173+
- name: Install cross
174+
run: cargo install cross --git https://github.com/cross-rs/cross
198175

199176
- name: Run cargo check for arm
200-
uses: actions-rs/cargo@v1
201-
with:
202-
command: check
203-
args: --target aarch64-apple-darwin
177+
run: cross check --target aarch64-apple-darwin
204178
env:
205-
SDKROOT: /Applications/Xcode_12.4.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX11.1.sdk
206-
MACOSX_DEPLOYMENT_TARGET: 11.1
207-
DEVELOPER_DIR: /Applications/Xcode_12.4.app
208-
179+
SDKROOT: /Applications/Xcode_14.2.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX13.1.sdk
180+
MACOSX_DEPLOYMENT_TARGET: 13.1
181+
DEVELOPER_DIR: /Applications/Xcode_14.2.app
209182

210183

211184

0 commit comments

Comments
 (0)