Skip to content

Commit 3ec081b

Browse files
committed
Bump versions in CI
- `clang-19` -> `clang-20` in ARM - `gcc-14.2` -> `gcc-14.3` in AArch64-BE - `gcc-14` ->`gcc-15` in LA64 - `riscv-gnu-v2025.01.20` -> `riscv-gnu-v2025.07.03` in Risc-V 32 - `wasmtime-v18.0.2` -> `wasmtime-v34.0.1`
1 parent 84ad860 commit 3ec081b

File tree

8 files changed

+17
-15
lines changed

8 files changed

+17
-15
lines changed

ci/docker/aarch64-unknown-linux-gnu/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
1010
qemu-user \
1111
make \
1212
file \
13-
clang-19 \
13+
clang \
1414
lld
1515

1616
ENV CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=aarch64-linux-gnu-gcc \

ci/docker/aarch64_be-unknown-linux-gnu/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
99
qemu-user \
1010
make \
1111
file \
12-
clang-19 \
12+
clang \
1313
curl \
1414
xz-utils \
1515
lld
1616

17-
ENV TOOLCHAIN="arm-gnu-toolchain-14.2.rel1-x86_64-aarch64_be-none-linux-gnu"
17+
ENV TOOLCHAIN="arm-gnu-toolchain-14.3.rel1-x86_64-aarch64_be-none-linux-gnu"
1818

1919
# Download the aarch64_be gcc toolchain
20-
RUN curl -L "https://developer.arm.com/-/media/Files/downloads/gnu/14.2.rel1/binrel/${TOOLCHAIN}.tar.xz" -o "${TOOLCHAIN}.tar.xz"
20+
RUN curl -L "https://developer.arm.com/-/media/Files/downloads/gnu/14.3.rel1/binrel/${TOOLCHAIN}.tar.xz" -o "${TOOLCHAIN}.tar.xz"
2121
RUN tar -xvf "${TOOLCHAIN}.tar.xz"
2222
RUN mkdir /toolchains && mv "./${TOOLCHAIN}" /toolchains
2323

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
1010
qemu-user \
1111
make \
1212
file \
13-
clang-19 \
13+
clang \
1414
lld
1515
ENV CARGO_TARGET_ARMV7_UNKNOWN_LINUX_GNUEABIHF_LINKER=arm-linux-gnueabihf-gcc \
1616
CARGO_TARGET_ARMV7_UNKNOWN_LINUX_GNUEABIHF_RUNNER="qemu-arm -cpu max -L /usr/arm-linux-gnueabihf" \

ci/docker/loongarch64-unknown-linux-gnu/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ FROM ubuntu:25.10
33
RUN apt-get update && \
44
apt-get install -y --no-install-recommends \
55
gcc libc6-dev qemu-user-static ca-certificates \
6-
gcc-14-loongarch64-linux-gnu libc6-dev-loong64-cross
6+
gcc-loongarch64-linux-gnu libc6-dev-loong64-cross
77

88

99
ENV CARGO_TARGET_LOONGARCH64_UNKNOWN_LINUX_GNU_LINKER=loongarch64-linux-gnu-gcc-14 \

ci/docker/riscv32gc-unknown-linux-gnu/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
44
gcc libc6-dev qemu-user ca-certificates \
55
wget xz-utils make file llvm
66

7-
ENV VERSION=2025.01.20
7+
ENV VERSION=2025.07.03
88

99
RUN wget "https://github.com/riscv-collab/riscv-gnu-toolchain/releases/download/${VERSION}/riscv32-glibc-ubuntu-24.04-gcc-nightly-${VERSION}-nightly.tar.xz" \
1010
-O riscv-toolchain.tar.xz

ci/docker/wasm32-wasip1/Dockerfile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@ RUN apt-get update -y && apt-get install -y --no-install-recommends \
77
xz-utils \
88
clang
99

10-
RUN curl -L https://github.com/bytecodealliance/wasmtime/releases/download/v18.0.2/wasmtime-v18.0.2-x86_64-linux.tar.xz | tar xJf -
11-
ENV PATH=$PATH:/wasmtime-v18.0.2-x86_64-linux
10+
ENV VERSION=v34.0.1
11+
12+
RUN curl -L https://github.com/bytecodealliance/wasmtime/releases/download/${VERSION}/wasmtime-${VERSION}-x86_64-linux.tar.xz | tar xJf -
13+
ENV PATH=$PATH:/wasmtime-${VERSION}-x86_64-linux
1214

1315
ENV CARGO_TARGET_WASM32_WASIP1_RUNNER="wasmtime --dir /checkout/target/wasm32-wasip1/release/deps::."

ci/run.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -144,21 +144,21 @@ case ${TARGET} in
144144
aarch64-unknown-linux-gnu*)
145145
TEST_CPPFLAGS="-fuse-ld=lld -I/usr/aarch64-linux-gnu/include/ -I/usr/aarch64-linux-gnu/include/c++/9/aarch64-linux-gnu/"
146146
TEST_SKIP_INTRINSICS=crates/intrinsic-test/missing_aarch64.txt
147-
TEST_CXX_COMPILER="clang++-19"
147+
TEST_CXX_COMPILER="clang++"
148148
TEST_RUNNER="${CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_RUNNER}"
149149
;;
150150

151151
aarch64_be-unknown-linux-gnu*)
152152
TEST_CPPFLAGS="-fuse-ld=lld"
153153
TEST_SKIP_INTRINSICS=crates/intrinsic-test/missing_aarch64.txt
154-
TEST_CXX_COMPILER="clang++-19"
154+
TEST_CXX_COMPILER="clang++"
155155
TEST_RUNNER="${CARGO_TARGET_AARCH64_BE_UNKNOWN_LINUX_GNU_RUNNER}"
156156
;;
157157

158158
armv7-unknown-linux-gnueabihf*)
159159
TEST_CPPFLAGS="-fuse-ld=lld -I/usr/arm-linux-gnueabihf/include/ -I/usr/arm-linux-gnueabihf/include/c++/9/arm-linux-gnueabihf/"
160160
TEST_SKIP_INTRINSICS=crates/intrinsic-test/missing_arm.txt
161-
TEST_CXX_COMPILER="clang++-19"
161+
TEST_CXX_COMPILER="clang++"
162162
TEST_RUNNER="${CARGO_TARGET_ARMV7_UNKNOWN_LINUX_GNUEABIHF_RUNNER}"
163163
;;
164164
*)

crates/intrinsic-test/src/arm/compile.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ pub fn compile_c_arm(
3838
.set_include_paths(vec![
3939
"/include",
4040
"/aarch64_be-none-linux-gnu/include",
41-
"/aarch64_be-none-linux-gnu/include/c++/14.2.1",
42-
"/aarch64_be-none-linux-gnu/include/c++/14.2.1/aarch64_be-none-linux-gnu",
43-
"/aarch64_be-none-linux-gnu/include/c++/14.2.1/backward",
41+
"/aarch64_be-none-linux-gnu/include/c++/14.3.1",
42+
"/aarch64_be-none-linux-gnu/include/c++/14.3.1/aarch64_be-none-linux-gnu",
43+
"/aarch64_be-none-linux-gnu/include/c++/14.3.1/backward",
4444
"/aarch64_be-none-linux-gnu/libc/usr/include",
4545
]);
4646
}

0 commit comments

Comments
 (0)