Skip to content

Commit d778f90

Browse files
authored
ansible: update cargo/rustc on Ubuntu 24.04 (#4393)
Refs: #4265 Signed-off-by: Richard Lau <richard.lau@ibm.com>
1 parent 1b95776 commit d778f90

4 files changed

Lines changed: 7 additions & 3 deletions

File tree

ansible/roles/baselayout/vars/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,6 @@ packages: {
141141

142142
# Default gcc/g++ package is 13.
143143
ubuntu2404: [
144-
'cargo-1.82,clang-19,gcc,g++,python3,python3-pip,python-is-python3,python3-venv,rustc-1.82',
144+
'cargo-1.89,clang-19,gcc,g++,python3,python3-pip,python-is-python3,python3-venv,rustc-1.89',
145145
],
146146
}

ansible/roles/docker/templates/ubuntu2404.Dockerfile.j2

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ RUN apt-get update && apt-get dist-upgrade -y && apt-get install -y \
2121
clang-19 \
2222
cargo-1.82 \
2323
rustc-1.82 \
24+
cargo-1.89 \
25+
rustc-1.89 \
2426
git \
2527
openjdk-21-jre-headless \
2628
curl \

ansible/roles/docker/templates/ubuntu2404_sharedlibs.Dockerfile.j2

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ RUN apt-get update && apt-get install apt-utils -y && \
2222
clang-19 \
2323
cargo-1.82 \
2424
rustc-1.82 \
25+
cargo-1.89 \
26+
rustc-1.89 \
2527
git \
2628
openjdk-21-jre-headless \
2729
pkg-config \

jenkins/scripts/select-compiler.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,8 @@ if [ "$NODEJS_MAJOR_VERSION" -ge "25" ]; then
7676
return
7777
;;
7878
*ubuntu2404*)
79-
export CARGO=cargo-1.82
80-
export RUSTC=rustc-1.82
79+
export CARGO=cargo-1.89
80+
export RUSTC=rustc-1.89
8181
echo "Using Clang for Node.js $NODEJS_MAJOR_VERSION"
8282
export CC="ccache clang-19"
8383
export CXX="ccache clang++-19"

0 commit comments

Comments
 (0)