diff --git a/image/.devcontainer/devcontainer.json b/image/.devcontainer/devcontainer.json index 0781c91cd..60e04e468 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 849253fae..9b6329f3d 100644 --- a/matrix.yml +++ b/matrix.yml @@ -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" } @@ -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