fix matrix_filter to include cuda_11.x

rapidsai · May 22, 2024 · dbf669b · dbf669b
1 parent b0b54b7
commit dbf669b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -66,8 +66,8 @@ jobs:
       sha: ${{ inputs.sha }}
       date: ${{ inputs.date }}
       script: ci/build_wheel.sh
-      # This selects "ARCH=amd64 + the latest supported Python + CUDA".
-      matrix_filter: map(select(.ARCH == "amd64")) | max_by([(.PY_VER|split(".")|map(tonumber)), (.CUDA_VER|split(".")|map(tonumber))]) | [.]
+      # This selects "ARCH=amd64 + the latest supported Python + One each of (CUDA 11.x, CUDA 12.x)".
+      matrix_filter: '[.[] | select(.ARCH == "amd64")] | group_by(.CUDA_VER | split(".")[0]) | map(max_by([.PY_VER, .CUDA_VER]))'
   wheel-publish:
     needs: wheel-build
     secrets: inherit

diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
@@ -64,14 +64,14 @@ jobs:
     with:
       build_type: pull-request
       script: ci/build_wheel.sh
-      # This selects "ARCH=amd64 + the latest supported Python + CUDA".
-      matrix_filter: map(select(.ARCH == "amd64")) | max_by([(.PY_VER|split(".")|map(tonumber)), (.CUDA_VER|split(".")|map(tonumber))]) | [.]
+      # This selects "ARCH=amd64 + the latest supported Python + One each of (CUDA 11.x, CUDA 12.x)".
+      matrix_filter: '[.[] | select(.ARCH == "amd64")] | group_by(.CUDA_VER | split(".")[0]) | map(max_by([.PY_VER, .CUDA_VER]))'
   wheel-tests:
     needs: wheel-build
     secrets: inherit
     uses: rapidsai/shared-workflows/.github/workflows/[email protected]
     with:
       build_type: pull-request
       script: ci/test_wheel.sh
-      # This selects "ARCH=amd64 + the latest supported Python + CUDA".
-      matrix_filter: map(select(.ARCH == "amd64")) | max_by([(.PY_VER|split(".")|map(tonumber)), (.CUDA_VER|split(".")|map(tonumber))]) | [.]
+      # This selects "ARCH=amd64 + the latest supported Python + One each of (CUDA 11.x, CUDA 12.x)".
+      matrix_filter: '[.[] | select(.ARCH == "amd64")] | group_by(.CUDA_VER | split(".")[0]) | map(max_by([.PY_VER, .CUDA_VER]))'
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -31,5 +31,5 @@ jobs:
       date: ${{ inputs.date }}
       sha: ${{ inputs.sha }}
       script: ci/test_wheel.sh
-      # This selects "ARCH=amd64 + the latest supported Python + CUDA".
-      matrix_filter: map(select(.ARCH == "amd64")) | max_by([(.PY_VER|split(".")|map(tonumber)), (.CUDA_VER|split(".")|map(tonumber))]) | [.]
+      # This selects "ARCH=amd64 + the latest supported Python + One each of (CUDA 11.x, CUDA 12.x)".
+      matrix_filter: '[.[] | select(.ARCH == "amd64")] | group_by(.CUDA_VER | split(".")[0]) | map(max_by([.PY_VER, .CUDA_VER]))'