diff --git a/ci/docker/armv7-unknown-linux-gnueabihf/Dockerfile b/ci/docker/armv7-unknown-linux-gnueabihf/Dockerfile index be9959240b..a131727c16 100644 --- a/ci/docker/armv7-unknown-linux-gnueabihf/Dockerfile +++ b/ci/docker/armv7-unknown-linux-gnueabihf/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:22.04 +FROM ubuntu:24.04 RUN apt-get update && apt-get install -y --no-install-recommends \ gcc \ g++ \ @@ -10,8 +10,9 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ qemu-user \ make \ file \ - clang-15 \ + clang \ lld + ENV CARGO_TARGET_ARMV7_UNKNOWN_LINUX_GNUEABIHF_LINKER=arm-linux-gnueabihf-gcc \ - CARGO_TARGET_ARMV7_UNKNOWN_LINUX_GNUEABIHF_RUNNER="qemu-arm -L /usr/arm-linux-gnueabihf" \ + CARGO_TARGET_ARMV7_UNKNOWN_LINUX_GNUEABIHF_RUNNER="qemu-armhf -L /usr/arm-linux-gnueabihf" \ OBJDUMP=arm-linux-gnueabihf-objdump diff --git a/ci/run.sh b/ci/run.sh index 28d53c5375..451a860127 100755 --- a/ci/run.sh +++ b/ci/run.sh @@ -8,7 +8,7 @@ set -ex # having only one thread increases debuggability to be worth it. #export RUST_BACKTRACE=full #export RUST_TEST_NOCAPTURE=1 -#export RUST_TEST_THREADS=1 +export RUST_TEST_THREADS=1 export RUSTFLAGS="${RUSTFLAGS} -D warnings -Z merge-functions=disabled " export HOST_RUSTFLAGS="${RUSTFLAGS}"