Skip to content

Commit b3ea266

Browse files
committed
Bump OS in armv7-unknown-linux-gnu
1 parent b4a1c14 commit b3ea266

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

ci/docker/armv7-unknown-linux-gnueabihf/Dockerfile

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:22.04
1+
FROM ubuntu:24.04
22
RUN apt-get update && apt-get install -y --no-install-recommends \
33
gcc \
44
g++ \
@@ -10,8 +10,9 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
1010
qemu-user \
1111
make \
1212
file \
13-
clang-15 \
13+
clang \
1414
lld
15+
1516
ENV CARGO_TARGET_ARMV7_UNKNOWN_LINUX_GNUEABIHF_LINKER=arm-linux-gnueabihf-gcc \
16-
CARGO_TARGET_ARMV7_UNKNOWN_LINUX_GNUEABIHF_RUNNER="qemu-arm -L /usr/arm-linux-gnueabihf" \
17+
CARGO_TARGET_ARMV7_UNKNOWN_LINUX_GNUEABIHF_RUNNER="qemu-armhf -L /usr/arm-linux-gnueabihf" \
1718
OBJDUMP=arm-linux-gnueabihf-objdump

ci/run.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ set -ex
88
# having only one thread increases debuggability to be worth it.
99
#export RUST_BACKTRACE=full
1010
#export RUST_TEST_NOCAPTURE=1
11-
#export RUST_TEST_THREADS=1
11+
export RUST_TEST_THREADS=1
1212

1313
export RUSTFLAGS="${RUSTFLAGS} -D warnings -Z merge-functions=disabled "
1414
export HOST_RUSTFLAGS="${RUSTFLAGS}"

0 commit comments

Comments
 (0)