Skip to content

Add gcc-15 + Ubuntu 25.04 #516

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

Open
wants to merge 9 commits into
base: branch-25.10
Choose a base branch
from
Open

Add gcc-15 + Ubuntu 25.04 #516

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
472d6cd
Hack in GCC-15 by adding PPA from plucky.
wmaxey May 19, 2025
22d1101
Bump GCC feature version.
wmaxey May 21, 2025
e65b7f2
build the gcc-15 image using Ubuntu 25.04 instead of backporting from…
wmaxey May 23, 2025
19118ae
Remove hack for fetching from plucky
wmaxey May 23, 2025
bcca629
Revert feature bump
wmaxey May 23, 2025
06f2e8b
Merge branch 'branch-25.08' into fea/gcc-15
wmaxey May 23, 2025
092a542
Merge branch 'branch-25.10' into fea/gcc-15
wmaxey Sep 24, 2025
c9309c4
Do not try to use apt-key with ubuntu25.04
miscco Nov 13, 2025
01a8a46
Different fix
miscco Nov 13, 2025
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
8 changes: 5 additions & 3 deletions features/src/llvm/llvm.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,9 +163,11 @@ if [ ! -f /etc/apt/trusted.gpg.d/apt.llvm.org.asc ]; then
wget --no-hsts -qO- https://apt.llvm.org/llvm-snapshot.gpg.key | tee /etc/apt/trusted.gpg.d/apt.llvm.org.asc
fi

if [[ -z "`apt-key list 2> /dev/null | grep -i llvm`" ]]; then
# Delete the key in the old format
apt-key del AF4F7421
if [[ "${UBUNTU_CODENAME}" != "plucky" ]]; then
if [[ -z "`apt-key list 2> /dev/null | grep -i llvm`" ]]; then
# Delete the key in the old format
apt-key del AF4F7421
fi
fi

cat <<"EOF" >> "/etc/apt/preferences.d/llvm-$LLVM_VERSION"
Expand Down
2 changes: 1 addition & 1 deletion image/.devcontainer/devcontainer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"upgradePackages": "true"
},
"ghcr.io/devcontainers/features/git:1.3.2": {
"ppa": "true",
"ppa": "false",
"version": "latest"
},
"ghcr.io/devcontainers/features/git-lfs:1.2.1": {
Expand Down
6 changes: 5 additions & 1 deletion matrix.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ x-gcc-11: &gcc_11 { name: "gcc", version: "11" }
x-gcc-12: &gcc_12 { name: "gcc", version: "12" }
x-gcc-13: &gcc_13 { name: "gcc", version: "13" }
x-gcc-14: &gcc_14 { name: "gcc", version: "14" }
x-gcc-15: &gcc_15 { name: "gcc", version: "15" }
x-gcc-env: &gcc_env { CC: "gcc", CXX: "g++", CUDAHOSTCXX: "g++" }
x-gcc-env-rapids: &gcc_env_rapids { CC: "gcc", CXX: "g++", CUDAHOSTCXX: "g++", PYTHON_VERSION: "3.13" }

Expand Down Expand Up @@ -153,7 +154,10 @@ include:
- { features: [*python, *dood, *llvm_21, { <<: *cuda_curr_max, <<: *cccl_cuda_opts }, *clang_format_cccl, *clangd_dev, *cccl_dev], env: *llvm_env }
- { features: [*python, *dood, *llvm_21, { <<: *cuda_curr_max, <<: *cccl_cuda_ext_opts }, *clang_format_cccl, *clangd_dev, *cccl_dev], env: *llvm_env }


- os: "ubuntu:25.04"
images:
- { features: [*python, *dood, *gcc_15, { <<: *cuda_curr_max, <<: *cccl_cuda_opts }, *clang_format_cccl, *clangd_dev, *cccl_dev], env: *gcc_env }

- os: "windows"
images:
- { features: [{ <<: *cuda_prev_min, <<: *cccl_cuda_opts }, { name: "cl", version: "14.29" }] } # MSVC 2019
Expand Down
Loading