From 2bab2bc611bd721eef28fd9e6bab484e174b26a2 Mon Sep 17 00:00:00 2001
From: Bradley Dice <bdice@bradleydice.com>
Date: Fri, 4 Oct 2024 10:26:03 -0500
Subject: [PATCH 1/2] Add Ubuntu 24.04 CI images. (#195)

---
 matrix.yaml | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/matrix.yaml b/matrix.yaml
index 8134904..1fcf529 100644
--- 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"

From de0381f6f5acb3a1aebb271fbd5bd009cf82ff66 Mon Sep 17 00:00:00 2001
From: jakirkham <jakirkham@gmail.com>
Date: Tue, 15 Oct 2024 08:24:06 -0700
Subject: [PATCH 2/2] Enable `conda-build` to produce `.conda` packages (#176)

---
 context/condarc.tmpl | 1 +
 1 file changed, 1 insertion(+)

diff --git a/context/condarc.tmpl b/context/condarc.tmpl
index 85f1e91..9700665 100644
--- 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