From ef93b1a10af0516fe1b80bb747739d1003ad4e6a Mon Sep 17 00:00:00 2001
From: Ray Douglass <ray@raydouglass.com>
Date: Wed, 2 Aug 2023 10:19:25 -0400
Subject: [PATCH 1/4] Add input to enable testing

---
 .github/workflows/build-test-publish-images.yml | 7 +++++--
 .github/workflows/pr.yml                        | 1 +
 .github/workflows/publish.yml                   | 6 ++++++
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build-test-publish-images.yml b/.github/workflows/build-test-publish-images.yml
index a858e6c8..63c1c1ef 100644
--- a/.github/workflows/build-test-publish-images.yml
+++ b/.github/workflows/build-test-publish-images.yml
@@ -6,6 +6,10 @@ on:
       build_type:
         required: true
         type: string
+      run_tests:
+        required: false
+        default: false
+        type: boolean
 
 defaults:
   run:
@@ -123,8 +127,7 @@ jobs:
         py${{ matrix.PYTHON_VER }}"
   test:
     needs: [build, compute-matrix]
-    # TODO: nightly tests
-    if: inputs.build_type == 'pull-request'
+    if: inputs.run_tests
     strategy:
       matrix: ${{ fromJSON(needs.compute-matrix.outputs.TEST_MATRIX) }}
       fail-fast: false
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index 895e33f6..a29e8bfa 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -14,4 +14,5 @@ jobs:
     uses: ./.github/workflows/build-test-publish-images.yml
     with:
       build_type: pull-request
+      run_tests: true
     secrets: inherit
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index e9228d40..1a94af76 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -7,6 +7,11 @@ on:
     tags:
       - v[0-9][0-9].[0-9][0-9].[0-9][0-9]
   workflow_dispatch:
+    inputs:
+      run_tests:
+        required: false
+        default: false
+        type: boolean
 
 concurrency:
   group: "${{ github.workflow }} @ ${{ github.ref }}"
@@ -17,6 +22,7 @@ jobs:
     uses: ./.github/workflows/build-test-publish-images.yml
     with:
       build_type: branch
+      run_tests: ${{ inputs.run_tests || false }}
     secrets: inherit
   readme:
     runs-on: ubuntu-latest

From b7542b9d46badcb3dec468f0b1c09d11c54474c5 Mon Sep 17 00:00:00 2001
From: Ray Douglass <ray@raydouglass.com>
Date: Wed, 2 Aug 2023 10:37:35 -0400
Subject: [PATCH 2/4] Update test matrix key

---
 matrix-test.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/matrix-test.yaml b/matrix-test.yaml
index 7263773d..42bcce55 100644
--- a/matrix-test.yaml
+++ b/matrix-test.yaml
@@ -2,7 +2,7 @@ pull-request:
   - { CUDA_VER: '11.2.2', ARCH: 'amd64', PYTHON_VER: '3.9', GPU: 'v100', DRIVER: 'earliest' }
   - { CUDA_VER: '12.0.1', ARCH: 'amd64', PYTHON_VER: '3.10', GPU: 'v100', DRIVER: 'latest' }
   - { CUDA_VER: '11.8.0', ARCH: 'arm64', PYTHON_VER: '3.10', GPU: 'a100', DRIVER: 'latest' }
-nightly:
+branch:
   - { CUDA_VER: '11.2.2', ARCH: 'amd64', PYTHON_VER: '3.9', GPU: 'v100', DRIVER: 'earliest' }
   - { CUDA_VER: '11.2.2', ARCH: 'amd64', PYTHON_VER: '3.9', GPU: 'v100', DRIVER: 'latest' }
   - { CUDA_VER: '11.8.0', ARCH: 'amd64', PYTHON_VER: '3.10', GPU: 'v100', DRIVER: 'latest' }

From 9b83efb5e5e09f79b66791d289471564e6af6f0d Mon Sep 17 00:00:00 2001
From: Ray Douglass <ray@raydouglass.com>
Date: Wed, 2 Aug 2023 17:11:00 -0400
Subject: [PATCH 3/4] Update configure-aws-credentials tag

---
 .github/workflows/test-notebooks.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test-notebooks.yml b/.github/workflows/test-notebooks.yml
index 707f5822..e85eceea 100644
--- a/.github/workflows/test-notebooks.yml
+++ b/.github/workflows/test-notebooks.yml
@@ -87,7 +87,7 @@ jobs:
       - name: Install awscli
         if: '!cancelled()'
         run: rapids-mamba-retry install -n base awscli
-      - uses: aws-actions/configure-aws-credentials@v1-node16
+      - uses: aws-actions/configure-aws-credentials@v2
         if: '!cancelled()'
         with:
           role-to-assume: ${{ vars.AWS_ROLE_ARN }}

From c509813dcc14fdfa99bb3cccbcb3cbe203389ddb Mon Sep 17 00:00:00 2001
From: Ray Douglass <ray@raydouglass.com>
Date: Fri, 4 Aug 2023 12:26:04 -0400
Subject: [PATCH 4/4] build-multiarch-manifest should run without tests

---
 .github/workflows/build-test-publish-images.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build-test-publish-images.yml b/.github/workflows/build-test-publish-images.yml
index 47dbe4a5..f9689f2f 100644
--- a/.github/workflows/build-test-publish-images.yml
+++ b/.github/workflows/build-test-publish-images.yml
@@ -150,7 +150,7 @@ jobs:
         ${{ matrix.ARCH }}"
   build-multiarch-manifest:
     if: inputs.build_type == 'branch'
-    needs: [build, test, compute-matrix]
+    needs: [build, compute-matrix]
     strategy:
       matrix: ${{ fromJSON(needs.compute-matrix.outputs.MATRIX) }}
     runs-on: ubuntu-latest