Skip to content

Commit 648c9e3

Browse files
committed
ci: bump MSRV to 1.85 and update actions
1 parent 1dcd041 commit 648c9e3

5 files changed

Lines changed: 44 additions & 44 deletions

File tree

.devcontainer/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# syntax=docker/dockerfile:1
22
ARG debian_version=slim-bookworm
3-
ARG rust_version=1.81.0
3+
ARG rust_version=1.85.0
44
FROM rust:${rust_version}-${debian_version}
55

66
ARG DEBIAN_FRONTEND=noninteractive

.devcontainer/Dockerfile.alpine

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# syntax=docker/dockerfile:1
22
ARG alpine_version=alpine3.19
3-
ARG rust_version=1.81.0
3+
ARG rust_version=1.85.0
44
FROM rust:${rust_version}-${alpine_version}
55

66
ENV CARGO_REGISTRIES_CRATES_IO_PROTOCOL="sparse"

.github/workflows/test.yml

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151
runs-on: ubuntu-latest
5252
steps:
5353
- name: Checkout code
54-
uses: actions/checkout@v4.2.2
54+
uses: actions/checkout@v5
5555
- name: Install toolchain
5656
run: curl https://sh.rustup.rs -sSf | sh -s -- --profile default --default-toolchain stable -y
5757
- run: cargo fmt --all -- --check
@@ -68,7 +68,7 @@ jobs:
6868
toolchain: [stable]
6969
steps:
7070
- name: Checkout code
71-
uses: actions/checkout@v4.2.2
71+
uses: actions/checkout@v4
7272

7373
- name: Install toolchain
7474
run: curl https://sh.rustup.rs -sSf | sh -s -- --profile default --default-toolchain ${{ matrix.toolchain }} -y
@@ -79,7 +79,7 @@ jobs:
7979
shell: bash
8080

8181
- name: Cache Rust dependencies
82-
uses: actions/cache@v4.2.0
82+
uses: actions/cache@v4
8383
with:
8484
path: |
8585
~/.cargo/registry/index
@@ -109,7 +109,7 @@ jobs:
109109
matrix:
110110
os: [ubuntu-latest]
111111
toolchain:
112-
- "1.81" # MSRV (Minimum supported rust version)
112+
- "1.85" # MSRV (Minimum supported rust version)
113113
- stable
114114
experimental: [false]
115115
# Ignore failures in beta
@@ -119,7 +119,7 @@ jobs:
119119
experimental: true
120120
steps:
121121
- name: Checkout code
122-
uses: actions/checkout@v4.2.2
122+
uses: actions/checkout@v5
123123

124124
- name: Install toolchain
125125
run: curl https://sh.rustup.rs -sSf | sh -s -- --profile minimal --default-toolchain ${{ matrix.toolchain }} -y
@@ -130,7 +130,7 @@ jobs:
130130
shell: bash
131131

132132
- name: Cache Rust dependencies
133-
uses: actions/cache@v4.2.0
133+
uses: actions/cache@v4
134134
with:
135135
path: |
136136
~/.cargo/registry/index
@@ -164,12 +164,12 @@ jobs:
164164
matrix:
165165
os: [windows-latest]
166166
toolchain:
167-
- "1.81" # MSRV (Minimum supported rust version)
167+
- "1.85" # MSRV (Minimum supported rust version)
168168
- stable
169169
steps:
170170
- name: Checkout code
171-
uses: actions/checkout@v4.2.2
172-
171+
uses: actions/checkout@v5
172+
173173
# hyper-rustls >=0.27 uses aws-lc as default backend which requires NASM to build
174174
- name: Install NASM
175175
uses: ilammy/[email protected]
@@ -183,7 +183,7 @@ jobs:
183183
shell: bash
184184

185185
- name: Cache Rust dependencies
186-
uses: actions/cache@v4.2.0
186+
uses: actions/cache@v4
187187
with:
188188
path: |
189189
~/.cargo/registry/index
@@ -210,16 +210,16 @@ jobs:
210210
fail-fast: false
211211
matrix:
212212
os: [ubuntu-latest]
213-
target:
213+
target:
214214
- armv7-unknown-linux-gnueabihf
215215
- aarch64-unknown-linux-gnu
216216
- riscv64gc-unknown-linux-gnu
217217
toolchain:
218-
- "1.81" # MSRV (Minimum supported rust version)
218+
- "1.85" # MSRV (Minimum supported rust version)
219219
- stable
220220
steps:
221221
- name: Checkout code
222-
uses: actions/checkout@v4.2.2
222+
uses: actions/checkout@v5
223223

224224
- name: Install toolchain
225225
run: curl https://sh.rustup.rs -sSf | sh -s -- --profile minimal --default-toolchain ${{ matrix.toolchain }} -y
@@ -230,7 +230,7 @@ jobs:
230230
shell: bash
231231

232232
- name: Cache Rust dependencies
233-
uses: actions/cache@v4.2.0
233+
uses: actions/cache@v4
234234
with:
235235
path: |
236236
~/.cargo/registry/index
@@ -250,36 +250,36 @@ jobs:
250250

251251
- name: Install cross compiler
252252
run: |
253-
if [ ${{ matrix.target }} = "armv7-unknown-linux-gnueabihf" ]; then
254-
sudo apt-get install -y gcc-arm-linux-gnueabihf
255-
fi
256-
if [ ${{ matrix.target }} = "aarch64-unknown-linux-gnu" ]; then
257-
sudo apt-get install -y gcc-aarch64-linux-gnu
258-
fi
259-
if [ ${{ matrix.target }} = "riscv64gc-unknown-linux-gnu" ]; then
260-
sudo apt-get install -y gcc-riscv64-linux-gnu
261-
fi
262-
253+
if [ ${{ matrix.target }} = "armv7-unknown-linux-gnueabihf" ]; then
254+
sudo apt-get install -y gcc-arm-linux-gnueabihf
255+
fi
256+
if [ ${{ matrix.target }} = "aarch64-unknown-linux-gnu" ]; then
257+
sudo apt-get install -y gcc-aarch64-linux-gnu
258+
fi
259+
if [ ${{ matrix.target }} = "riscv64gc-unknown-linux-gnu" ]; then
260+
sudo apt-get install -y gcc-riscv64-linux-gnu
261+
fi
262+
263263
- name: Set target link compiler
264264
run: |
265-
# Convert target to uppercase and replace - with _
266-
target=${{ matrix.target }}
267-
target=${target^^}
268-
target=${target//-/_}
269-
if [ ${{ matrix.target }} = "armv7-unknown-linux-gnueabihf" ]; then
270-
echo "CARGO_TARGET_${target}_LINKER=arm-linux-gnueabihf-gcc" >> $GITHUB_ENV
271-
fi
272-
if [ ${{ matrix.target }} = "aarch64-unknown-linux-gnu" ]; then
273-
echo "CARGO_TARGET_${target}_LINKER=aarch64-linux-gnu-gcc" >> $GITHUB_ENV
274-
fi
275-
if [ ${{ matrix.target }} = "riscv64gc-unknown-linux-gnu" ]; then
276-
echo "CARGO_TARGET_${target}_LINKER=riscv64-linux-gnu-gcc" >> $GITHUB_ENV
277-
fi
278-
265+
# Convert target to uppercase and replace - with _
266+
target=${{ matrix.target }}
267+
target=${target^^}
268+
target=${target//-/_}
269+
if [ ${{ matrix.target }} = "armv7-unknown-linux-gnueabihf" ]; then
270+
echo "CARGO_TARGET_${target}_LINKER=arm-linux-gnueabihf-gcc" >> $GITHUB_ENV
271+
fi
272+
if [ ${{ matrix.target }} = "aarch64-unknown-linux-gnu" ]; then
273+
echo "CARGO_TARGET_${target}_LINKER=aarch64-linux-gnu-gcc" >> $GITHUB_ENV
274+
fi
275+
if [ ${{ matrix.target }} = "riscv64gc-unknown-linux-gnu" ]; then
276+
echo "CARGO_TARGET_${target}_LINKER=riscv64-linux-gnu-gcc" >> $GITHUB_ENV
277+
fi
278+
279279
- name: Fetch
280280
run: cargo fetch --locked
281281
- name: Build
282282
run: cargo build --frozen --verbose --target ${{ matrix.target }} --no-default-features
283-
283+
284284
- name: Check binary
285285
run: file target/${{ matrix.target }}/debug/librespot

contrib/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,10 @@ RUN dpkg --add-architecture arm64 && \
4040
libpulse0:arm64 \
4141
libpulse0:armel \
4242
libpulse0:armhf \
43-
pkg-config
43+
pkg-config
4444

4545
ENV PATH="/root/.cargo/bin/:${PATH}"
46-
RUN curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain 1.81 -y && \
46+
RUN curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain 1.85 -y && \
4747
rustup target add aarch64-unknown-linux-gnu && \
4848
rustup target add arm-unknown-linux-gnueabi && \
4949
rustup target add arm-unknown-linux-gnueabihf && \

contrib/cross-compile-armv6hf/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ RUN mkdir /sysroot && \
2222
dpkg -x libasound2-dev*.deb /sysroot/
2323

2424
# Install rust.
25-
RUN curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain 1.81 -y
25+
RUN curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain 1.85 -y
2626
ENV PATH="/root/.cargo/bin/:${PATH}"
2727
RUN rustup target add arm-unknown-linux-gnueabihf
2828
RUN mkdir /.cargo && \

0 commit comments

Comments
 (0)