From 96d1d800643099d29fc27c1032a4c1a4e87cb9ae Mon Sep 17 00:00:00 2001 From: Richard Lau Date: Fri, 3 Jul 2026 17:33:36 +0100 Subject: [PATCH] ansible: update cargo/rustc on Ubuntu 24.04 Signed-off-by: Richard Lau --- ansible/roles/baselayout/vars/main.yml | 2 +- ansible/roles/docker/templates/ubuntu2404.Dockerfile.j2 | 2 ++ .../docker/templates/ubuntu2404_sharedlibs.Dockerfile.j2 | 2 ++ jenkins/scripts/select-compiler.sh | 4 ++-- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ansible/roles/baselayout/vars/main.yml b/ansible/roles/baselayout/vars/main.yml index 967fcf975..47d7f636c 100644 --- a/ansible/roles/baselayout/vars/main.yml +++ b/ansible/roles/baselayout/vars/main.yml @@ -141,6 +141,6 @@ packages: { # Default gcc/g++ package is 13. ubuntu2404: [ - 'cargo-1.82,clang-19,gcc,g++,python3,python3-pip,python-is-python3,python3-venv,rustc-1.82', + 'cargo-1.89,clang-19,gcc,g++,python3,python3-pip,python-is-python3,python3-venv,rustc-1.89', ], } diff --git a/ansible/roles/docker/templates/ubuntu2404.Dockerfile.j2 b/ansible/roles/docker/templates/ubuntu2404.Dockerfile.j2 index 7b8f42f03..a844d22ba 100644 --- a/ansible/roles/docker/templates/ubuntu2404.Dockerfile.j2 +++ b/ansible/roles/docker/templates/ubuntu2404.Dockerfile.j2 @@ -21,6 +21,8 @@ RUN apt-get update && apt-get dist-upgrade -y && apt-get install -y \ clang-19 \ cargo-1.82 \ rustc-1.82 \ + cargo-1.89 \ + rustc-1.89 \ git \ openjdk-21-jre-headless \ curl \ diff --git a/ansible/roles/docker/templates/ubuntu2404_sharedlibs.Dockerfile.j2 b/ansible/roles/docker/templates/ubuntu2404_sharedlibs.Dockerfile.j2 index 2765b267d..ea7e37ffe 100644 --- a/ansible/roles/docker/templates/ubuntu2404_sharedlibs.Dockerfile.j2 +++ b/ansible/roles/docker/templates/ubuntu2404_sharedlibs.Dockerfile.j2 @@ -22,6 +22,8 @@ RUN apt-get update && apt-get install apt-utils -y && \ clang-19 \ cargo-1.82 \ rustc-1.82 \ + cargo-1.89 \ + rustc-1.89 \ git \ openjdk-21-jre-headless \ pkg-config \ diff --git a/jenkins/scripts/select-compiler.sh b/jenkins/scripts/select-compiler.sh index 0e693aa99..3a744db44 100644 --- a/jenkins/scripts/select-compiler.sh +++ b/jenkins/scripts/select-compiler.sh @@ -76,8 +76,8 @@ if [ "$NODEJS_MAJOR_VERSION" -ge "25" ]; then return ;; *ubuntu2404*) - export CARGO=cargo-1.82 - export RUSTC=rustc-1.82 + export CARGO=cargo-1.89 + export RUSTC=rustc-1.89 echo "Using Clang for Node.js $NODEJS_MAJOR_VERSION" export CC="ccache clang-19" export CXX="ccache clang++-19"