Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
- lld-{{rhel_llvm_version}}
- lld-libs-{{rhel_llvm_version}}
- llvm-{{rhel_llvm_version}}
- llvm-filesystem-{{rhel_llvm_version}}
- llvm-libs-{{rhel_llvm_version}}
- llvm-toolset-{{rhel_llvm_version}}
- rust-{{rhel_rust_version}}
Expand Down
9 changes: 6 additions & 3 deletions ansible/roles/baselayout/vars/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,12 @@
git_no_binpkg: [ ]
git_version: 2.10.2

# toolchain versions
rhel_llvm_version: 19.1.7
rhel_rust_version: 1.84.1
# Toolchain versions.
# If changing the RHEL versions, you may need to run `dnf versionlock clear`
# before running the playbook to undo previous version locking in
# ansible\roles\baselayout\tasks\partials\postinstall\rhel.yml.
rhel_llvm_version: 20.1.8
rhel_rust_version: 1.88.0

ssh_config: /etc/ssh/sshd_config

Expand Down
4 changes: 2 additions & 2 deletions ansible/roles/docker/templates/rhel8.Dockerfile.j2
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@ RUN . /secrets.txt \
gcc-toolset-14-libatomic-devel \
git \
java-17-openjdk-headless \
llvm-toolset-19.1.7 \
llvm-toolset-20.1.8 \
make \
python3.12 \
python3.12-pip \
procps-ng \
rust-toolset-1.84.1 \
rust-toolset-1.88.0 \
xz \
&& dnf clean all \
&& subscription-manager unregister
Expand Down
4 changes: 2 additions & 2 deletions ansible/roles/docker/templates/ubi81.Dockerfile.j2
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,13 @@ RUN chmod u+x /secrets.txt && . /secrets.txt \
gcc-toolset-14-libatomic-devel \
git \
java-17-openjdk-headless \
llvm-toolset-19.1.7 \
llvm-toolset-20.1.8 \
make \
python3.12 \
python3.12-pip \
openssl-devel \
procps-ng \
rust-toolset-1.84.1 \
rust-toolset-1.88.0 \
&& dnf clean all \
&& subscription-manager unregister

Expand Down