Merge branch 'main' into renovate/condaforge-miniforge3-24.x

rapidsai · Oct 15, 2024 · dfafa4c · dfafa4c
2 parents 401e337 + de0381f
commit dfafa4c
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/context/condarc.tmpl b/context/condarc.tmpl
@@ -7,6 +7,7 @@ channels:
   - conda-forge
   - nvidia
 conda-build:
+  pkg_format: '2'
   set_build_id: false
   root_dir: $RAPIDS_CONDA_BLD_ROOT_DIR
   output_folder: $RAPIDS_CONDA_BLD_OUTPUT_DIR

diff --git a/matrix.yaml b/matrix.yaml
@@ -11,6 +11,7 @@ PYTHON_VER:
 LINUX_VER:
   - "ubuntu20.04"
   - "ubuntu22.04"
+  - "ubuntu24.04"
   - "rockylinux8"
 CI_IMAGE_CONFIG:
   - IMAGE_REPO: "miniforge-cuda"
@@ -29,6 +30,14 @@ exclude:
   # Exclusions from CUDA's OS support matrix
   - LINUX_VER: "ubuntu22.04"
     CUDA_VER: "11.4.3"
+  - LINUX_VER: "ubuntu24.04"
+    CUDA_VER: "11.4.3"
+  - LINUX_VER: "ubuntu24.04"
+    CUDA_VER: "11.8.0"
+  - LINUX_VER: "ubuntu24.04"
+    CUDA_VER: "12.0.1"
+  - LINUX_VER: "ubuntu24.04"
+    CUDA_VER: "12.2.2"
 
   # Only build ci-wheel for the latest CUDA of each major version
   - CUDA_VER: "11.4.3"
@@ -43,6 +52,8 @@ exclude:
     IMAGE_REPO: "ci-wheel"
   - LINUX_VER: "ubuntu22.04"
     IMAGE_REPO: "ci-wheel"
+  - LINUX_VER: "ubuntu24.04"
+    IMAGE_REPO: "ci-wheel"
 
   # Exclude citestwheel for CUDA versions older than 11.8.0
   - CUDA_VER: "11.4.3"