Skip to content

ansible: update cargo/rustc on Ubuntu 24.04 #4393

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
richardlau merged 1 commit into from
Jul 3, 2026
+7 −3
Merged

ansible: update cargo/rustc on Ubuntu 24.04 #4393

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ansible/roles/baselayout/vars/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
],
}
2 changes: 2 additions & 0 deletions ansible/roles/docker/templates/ubuntu2404.Dockerfile.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Comment on lines 22 to +25

@richardlau richardlau Jul 3, 2026

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For both Dockerfiles we only really need cargo-1.89/rustc-1.89 but to aid transition (since select-compiler.sh needs to pick one of them) I've left 1.82 in there for removal later.

git \
openjdk-21-jre-headless \
curl \
Expand Down
2 changes: 2 additions & 0 deletions ansible/roles/docker/templates/ubuntu2404_sharedlibs.Dockerfile.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
4 changes: 2 additions & 2 deletions jenkins/scripts/select-compiler.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down