Skip to content

Commit e9234d3

Browse files
authored
Merge pull request #1318 from yubiuser/hyper
Update hyper-rustls to 0.27 and adjust CI workflow
2 parents 99ef3ec + 78a8c61 commit e9234d3

5 files changed

Lines changed: 145 additions & 28 deletions

File tree

.cargo/config.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
2+
[target.armv7-unknown-linux-gnueabihf]
3+
linker = "arm-linux-gnueabihf-gcc"

.github/workflows/test.yml

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,10 @@ jobs:
168168
steps:
169169
- name: Checkout code
170170
uses: actions/[email protected]
171+
172+
# hyper-rustls >=0.27 uses aws-lc as default backend which requires NASM to build
173+
- name: Install NASM
174+
uses: ilammy/[email protected]
171175

172176
- name: Install toolchain
173177
run: curl https://sh.rustup.rs -sSf | sh -s -- --profile minimal --default-toolchain ${{ matrix.toolchain }} -y
@@ -229,7 +233,15 @@ jobs:
229233
~/.cargo/git
230234
target
231235
key: ${{ runner.os }}-${{ matrix.target }}-${{ steps.get-rustc-version.outputs.version }}-${{ hashFiles('Cargo.lock') }}
232-
- name: Install cross
233-
run: cargo install cross || true
236+
237+
- name: Install the cross compiler targets
238+
run: rustup target add ${{ matrix.target }}
239+
240+
- name: Install cross compiler toolchain
241+
run: sudo apt-get install -y gcc-arm-linux-gnueabihf
242+
234243
- name: Build
235-
run: cross build --target ${{ matrix.target }} --no-default-features
244+
run: cargo build --verbose --target ${{ matrix.target }} --no-default-features
245+
246+
- name: Check binary
247+
run: file target/${{ matrix.target }}/debug/librespot

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
target
2-
.cargo
32
spotify_appkey.key
43
.vagrant/
54
.project

0 commit comments

Comments
 (0)