Merge branch 'branch-25.04' into fix-gha-workspace-local-path

rapidsai · Feb 26, 2025 · 5cd38e3 · 5cd38e3
2 parents aabb22d + 81ea864
commit 5cd38e3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/conda/recipes/librmm/recipe.yaml b/conda/recipes/librmm/recipe.yaml
@@ -5,8 +5,8 @@ schema_version: 1
 context:
   version: ${{ env.get("RAPIDS_PACKAGE_VERSION") }}
   cuda_version: ${{ (env.get("RAPIDS_CUDA_VERSION") | split("."))[:2] | join(".") }}
-  cuda_major: ${{ (env.get("RAPIDS_CUDA_VERSION") | split("."))[0] }}
-  date_string: ${{ env.get("RAPIDS_DATE_STRING") }}
+  cuda_major: '${{ (env.get("RAPIDS_CUDA_VERSION") | split("."))[0] }}'
+  date_string: '${{ env.get("RAPIDS_DATE_STRING") }}'
   head_rev: ${{ git.head_rev(".")[:8] }}
 
 recipe:

diff --git a/conda/recipes/rmm/recipe.yaml b/conda/recipes/rmm/recipe.yaml
@@ -4,9 +4,10 @@
 context:
   version: ${{ env.get("RAPIDS_PACKAGE_VERSION") }}
   cuda_version: ${{ (env.get("RAPIDS_CUDA_VERSION") | split("."))[:2] | join(".") }}
-  cuda_major: ${{ (env.get("RAPIDS_CUDA_VERSION") | split("."))[0] }}
-  date_string: ${{ env.get("RAPIDS_DATE_STRING") }}
-  py_version: ${{ env.get("RAPIDS_PY_VERSION") | version_to_buildstring }}
+  cuda_major: '${{ (env.get("RAPIDS_CUDA_VERSION") | split("."))[0] }}'
+  date_string: '${{ env.get("RAPIDS_DATE_STRING") }}'
+  py_version: ${{ env.get("RAPIDS_PY_VERSION") }}
+  py_buildstring : ${{ py_version | version_to_buildstring }}
   head_rev: ${{ git.head_rev(".")[:8] }}
 
 package:
@@ -17,7 +18,7 @@ source:
   - path: ../../..
 
 build:
-  string: cuda${{ cuda_major }}_py${{ py_version }}_${{ date_string }}_${{ head_rev }}
+  string: cuda${{ cuda_major }}_py${{ py_buildstring }}_${{ date_string }}_${{ head_rev }}
   script:
     content:
       - ./build.sh -v clean rmm --cmake-args=\"-DCMAKE_INSTALL_LIBDIR=lib\"
@@ -58,7 +59,7 @@ requirements:
     - cython >=3.0.0
     - rapids-build-backend >=0.3.0,<0.4.0.dev0
     - librmm =${{ version }}
-    - python
+    - python =${{ py_version }}
     - pip
     - scikit-build-core >=0.10.0
   run: