From 472d6cd1b5a79e83e5aeb9637e366951a008dfc1 Mon Sep 17 00:00:00 2001 From: Wesley Maxey <71408887+wmaxey@users.noreply.github.com> Date: Mon, 19 May 2025 14:30:37 -0700 Subject: [PATCH 1/5] Hack in GCC-15 by adding PPA from plucky. --- features/src/gcc/install.sh | 5 +++++ matrix.yml | 2 ++ 2 files changed, 7 insertions(+) diff --git a/features/src/gcc/install.sh b/features/src/gcc/install.sh index 1e1d18106..ab689eafa 100755 --- a/features/src/gcc/install.sh +++ b/features/src/gcc/install.sh @@ -23,6 +23,11 @@ check_packages \ GCC_VERSION_DEFAULT="$(gcc -dumpversion)"; GCC_VERSION="${VERSION:-${GCC_VERSION_DEFAULT}}"; +if [[ "${GCC_VERSION}" == "15" ]]; then + apt-add-repository -y "deb https://ppa.launchpadcontent.net/ubuntu-toolchain-r/ppa/ubuntu plucky main"; + apt-add-repository -y "deb https://ppa.launchpadcontent.net/ubuntu-toolchain-r/test/ubuntu plucky main"; +fi + if [[ "${GCC_VERSION}" != "${GCC_VERSION_DEFAULT}" ]]; then apt-add-repository -y ppa:ubuntu-toolchain-r/test; apt-add-repository -y ppa:ubuntu-toolchain-r/ppa; diff --git a/matrix.yml b/matrix.yml index 074e8147f..9a8b1d382 100644 --- a/matrix.yml +++ b/matrix.yml @@ -13,6 +13,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" } @@ -113,6 +114,7 @@ include: images: - { features: [*python, *gcc_13, { <<: *cuda_curr_max, <<: *cccl_cuda_opts }, *clang_format_cccl, *clangd_dev, *cccl_dev], env: *gcc_env } - { features: [*python, *gcc_14, { <<: *cuda_curr_max, <<: *cccl_cuda_opts }, *clang_format_cccl, *clangd_dev, *cccl_dev], env: *gcc_env } + - { features: [*python, *gcc_15, { <<: *cuda_curr_max, <<: *cccl_cuda_opts }, *clang_format_cccl, *clangd_dev, *cccl_dev], env: *gcc_env } - os: "windows" images: From 22d1101f617e0ddf72da8056347a7da3b8c534b5 Mon Sep 17 00:00:00 2001 From: Wesley Maxey <71408887+wmaxey@users.noreply.github.com> Date: Wed, 21 May 2025 10:50:13 -0700 Subject: [PATCH 2/5] Bump GCC feature version. --- features/src/gcc/devcontainer-feature.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/features/src/gcc/devcontainer-feature.json b/features/src/gcc/devcontainer-feature.json index 8ae908dbf..1ab8d4db1 100644 --- a/features/src/gcc/devcontainer-feature.json +++ b/features/src/gcc/devcontainer-feature.json @@ -1,7 +1,7 @@ { "name": "GCC", "id": "gcc", - "version": "25.8.0", + "version": "25.8.1", "description": "A feature to install gcc", "options": { "version": { From e65b7f26c0f82f0fb651c40f4117161109d0a171 Mon Sep 17 00:00:00 2001 From: Wesley Maxey Date: Fri, 23 May 2025 13:51:12 -0700 Subject: [PATCH 3/5] build the gcc-15 image using Ubuntu 25.04 instead of backporting from the plucky stream. --- image/.devcontainer/devcontainer.json | 2 +- matrix.yml | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/image/.devcontainer/devcontainer.json b/image/.devcontainer/devcontainer.json index aa17b0dde..fdabcff93 100644 --- a/image/.devcontainer/devcontainer.json +++ b/image/.devcontainer/devcontainer.json @@ -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": { diff --git a/matrix.yml b/matrix.yml index 9a8b1d382..261cdbe06 100644 --- a/matrix.yml +++ b/matrix.yml @@ -116,6 +116,10 @@ include: - { features: [*python, *gcc_14, { <<: *cuda_curr_max, <<: *cccl_cuda_opts }, *clang_format_cccl, *clangd_dev, *cccl_dev], env: *gcc_env } - { features: [*python, *gcc_15, { <<: *cuda_curr_max, <<: *cccl_cuda_opts }, *clang_format_cccl, *clangd_dev, *cccl_dev], env: *gcc_env } +- os: "ubuntu:25.04" + images: + - { features: [*python, *gcc_15, { <<: *cuda_curr_max, <<: *cccl_cuda_opts }, *clang_format_cccl, *clangd_dev, *cccl_dev], env: *gcc_env } + - os: "windows" images: # lowest CUDA version From 19118ae0a377d2fa32e64b4d62dfed4546fee180 Mon Sep 17 00:00:00 2001 From: Wesley Maxey Date: Fri, 23 May 2025 13:54:51 -0700 Subject: [PATCH 4/5] Remove hack for fetching from plucky --- features/src/gcc/install.sh | 5 ----- 1 file changed, 5 deletions(-) diff --git a/features/src/gcc/install.sh b/features/src/gcc/install.sh index ab689eafa..1e1d18106 100755 --- a/features/src/gcc/install.sh +++ b/features/src/gcc/install.sh @@ -23,11 +23,6 @@ check_packages \ GCC_VERSION_DEFAULT="$(gcc -dumpversion)"; GCC_VERSION="${VERSION:-${GCC_VERSION_DEFAULT}}"; -if [[ "${GCC_VERSION}" == "15" ]]; then - apt-add-repository -y "deb https://ppa.launchpadcontent.net/ubuntu-toolchain-r/ppa/ubuntu plucky main"; - apt-add-repository -y "deb https://ppa.launchpadcontent.net/ubuntu-toolchain-r/test/ubuntu plucky main"; -fi - if [[ "${GCC_VERSION}" != "${GCC_VERSION_DEFAULT}" ]]; then apt-add-repository -y ppa:ubuntu-toolchain-r/test; apt-add-repository -y ppa:ubuntu-toolchain-r/ppa; From bcca629d33f97e3e4c3de652376c3d2a38e06227 Mon Sep 17 00:00:00 2001 From: Wesley Maxey Date: Fri, 23 May 2025 13:55:38 -0700 Subject: [PATCH 5/5] Revert feature bump --- features/src/gcc/devcontainer-feature.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/features/src/gcc/devcontainer-feature.json b/features/src/gcc/devcontainer-feature.json index 1ab8d4db1..8ae908dbf 100644 --- a/features/src/gcc/devcontainer-feature.json +++ b/features/src/gcc/devcontainer-feature.json @@ -1,7 +1,7 @@ { "name": "GCC", "id": "gcc", - "version": "25.8.1", + "version": "25.8.0", "description": "A feature to install gcc", "options": { "version": {