Revert to a single test matrix, but drop Ubuntu 18.04.

rapidsai · Jan 11, 2024 · 5a27d41 · 5a27d41
1 parent 108e2bf
commit 5a27d41
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 25 deletions.
diff --git a/.github/actions/compute-matrix/action.yaml b/.github/actions/compute-matrix/action.yaml
@@ -3,10 +3,8 @@ name: Compute matrix
 outputs:
   BUILD_MATRIX:
     value: ${{ steps.compute-matrix.outputs.BUILD_MATRIX }}
-  TEST_MATRIX_WHEELS:
-    value: ${{ steps.compute-matrix.outputs.TEST_MATRIX_WHEELS }}
-  TEST_MATRIX_CONDA:
-    value: ${{ steps.compute-matrix.outputs.TEST_MATRIX_CONDA }}
+  TEST_MATRIX:
+    value: ${{ steps.compute-matrix.outputs.TEST_MATRIX }}
 
 runs:
   using: composite
@@ -26,16 +24,7 @@ runs:
         - { CUDA_VER: '12.0.1', ARCH: 'arm64', PY_VER: '3.11', LINUX_VER: 'rockylinux8' }
         "
 
-        export TEST_MATRIX_WHEELS="
-          - { CUDA_VER: '12.0.1', ARCH: 'amd64', PY_VER: '3.9', LINUX_VER: 'ubuntu18.04', gpu: 'v100', driver: 'latest' }
-          - { CUDA_VER: '12.0.1', ARCH: 'amd64', PY_VER: '3.10', LINUX_VER: 'ubuntu18.04', gpu: 'v100', driver: 'latest' }
-          - { CUDA_VER: '12.0.1', ARCH: 'amd64', PY_VER: '3.11', LINUX_VER: 'ubuntu18.04', gpu: 'v100', driver: 'latest' }
-          - { CUDA_VER: '12.0.1', ARCH: 'arm64', PY_VER: '3.9', LINUX_VER: 'ubuntu20.04', gpu: 'a100', driver: 'latest' }
-          - { CUDA_VER: '12.0.1', ARCH: 'arm64', PY_VER: '3.10', LINUX_VER: 'ubuntu20.04', gpu: 'a100', driver: 'latest' }
-          - { CUDA_VER: '12.0.1', ARCH: 'arm64', PY_VER: '3.11', LINUX_VER: 'ubuntu20.04', gpu: 'a100', driver: 'latest' }
-        "
-
-        export TEST_MATRIX_CONDA="
+        export TEST_MATRIX="
           - { CUDA_VER: '12.0.1', ARCH: 'amd64', PY_VER: '3.9', LINUX_VER: 'ubuntu20.04', gpu: 'v100', driver: 'latest' }
           - { CUDA_VER: '12.0.1', ARCH: 'amd64', PY_VER: '3.10', LINUX_VER: 'ubuntu20.04', gpu: 'v100', driver: 'latest' }
           - { CUDA_VER: '12.0.1', ARCH: 'amd64', PY_VER: '3.11', LINUX_VER: 'ubuntu20.04', gpu: 'v100', driver: 'latest' }
@@ -49,12 +38,7 @@ runs:
           jq -c '.' \
         )" | tee --append "${GITHUB_OUTPUT}"
 
-        echo "TEST_MATRIX_WHEELS=$(
-          yq -n -o json 'env(TEST_MATRIX_WHEELS)' | \
-          jq -c '.' \
-        )" | tee --append "${GITHUB_OUTPUT}"
-
-        echo "TEST_MATRIX_CONDA=$(
-          yq -n -o json 'env(TEST_MATRIX_CONDA)' | \
+        echo "TEST_MATRIX=$(
+          yq -n -o json 'env(TEST_MATRIX)' | \
           jq -c '.' \
         )" | tee --append "${GITHUB_OUTPUT}"
diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
@@ -30,8 +30,7 @@ jobs:
     runs-on: ubuntu-latest
     outputs:
       BUILD_MATRIX: ${{ steps.compute-matrix.outputs.BUILD_MATRIX }}
-      TEST_MATRIX_WHEELS: ${{ steps.compute-matrix.outputs.TEST_MATRIX_WHEELS }}
-      TEST_MATRIX_CONDA: ${{ steps.compute-matrix.outputs.TEST_MATRIX_CONDA }}
+      TEST_MATRIX: ${{ steps.compute-matrix.outputs.TEST_MATRIX }}
     steps:
       - uses: actions/checkout@v4
       - name: Compute Build Matrix
@@ -53,7 +52,7 @@ jobs:
     with:
       build_type: pull-request
       test_script: "ci/test_conda.sh"
-      matrix_filter: ${{ needs.compute-matrix.outputs.TEST_MATRIX_CONDA }}
+      matrix_filter: ${{ needs.compute-matrix.outputs.TEST_MATRIX }}
   build-wheels:
     needs:
       - compute-matrix
@@ -70,4 +69,4 @@ jobs:
     with:
       build_type: pull-request
       script: "ci/test_wheel.sh"
-      matrix_filter: ${{ needs.compute-matrix.outputs.TEST_MATRIX_WHEELS }}
+      matrix_filter: ${{ needs.compute-matrix.outputs.TEST_MATRIX }}