From 0c3dfacf03a4d27cbc0af12cb3f2d104564321ea Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Thu, 18 Jan 2024 11:09:24 -0800
Subject: [PATCH 01/17] use configFile instead of copying the devcontainer up
 one level (https://github.com/devcontainers/ci/pull/269)

---
 .github/workflows/build-in-devcontainer.yaml | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/.github/workflows/build-in-devcontainer.yaml b/.github/workflows/build-in-devcontainer.yaml
index 526828ce..cd964c1a 100644
--- a/.github/workflows/build-in-devcontainer.yaml
+++ b/.github/workflows/build-in-devcontainer.yaml
@@ -69,17 +69,12 @@ jobs:
         uses: actions/setup-node@v3
         with:
           node-version: '16'
-      - if: ${{ env.HAS_DEVCONTAINER == 'true' }}
-        name: Copy devcontainer.json file up one level
-        run: |
-          echo "REPOSITORY=$(basename $(pwd))" | tee -a "${GITHUB_ENV}";
-          cp .devcontainer/cuda${{ matrix.cuda }}-${{ matrix.pkgr }}/devcontainer.json \
-             .devcontainer/devcontainer.json;
       - if: ${{ env.HAS_DEVCONTAINER == 'true' }}
         name: Run build in devcontainer
         uses: devcontainers/ci@v0.3
         with:
           push: never
+          configFile: .devcontainer/cuda${{ matrix.cuda }}-${{ matrix.pkgr }}/devcontainer.json
           env: |
             REPOSITORY=${{ env.REPOSITORY }}
             SCCACHE_REGION=${{ vars.AWS_REGION }}

From 85f3e8535fac36ccf7da8c147ee28beafca25965 Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Thu, 18 Jan 2024 11:15:43 -0800
Subject: [PATCH 02/17] set subFolder

---
 .github/workflows/build-in-devcontainer.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/build-in-devcontainer.yaml b/.github/workflows/build-in-devcontainer.yaml
index cd964c1a..23e0b53c 100644
--- a/.github/workflows/build-in-devcontainer.yaml
+++ b/.github/workflows/build-in-devcontainer.yaml
@@ -74,6 +74,7 @@ jobs:
         uses: devcontainers/ci@v0.3
         with:
           push: never
+          subFolder: .devcontainer/cuda${{ matrix.cuda }}-${{ matrix.pkgr }}
           configFile: .devcontainer/cuda${{ matrix.cuda }}-${{ matrix.pkgr }}/devcontainer.json
           env: |
             REPOSITORY=${{ env.REPOSITORY }}

From f1cb463a546421cbb07d994ed71a90fe2c04d205 Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Thu, 18 Jan 2024 11:21:16 -0800
Subject: [PATCH 03/17] quote REPOSITORY envvar

---
 .github/workflows/build-in-devcontainer.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build-in-devcontainer.yaml b/.github/workflows/build-in-devcontainer.yaml
index 23e0b53c..dc0a505b 100644
--- a/.github/workflows/build-in-devcontainer.yaml
+++ b/.github/workflows/build-in-devcontainer.yaml
@@ -77,7 +77,7 @@ jobs:
           subFolder: .devcontainer/cuda${{ matrix.cuda }}-${{ matrix.pkgr }}
           configFile: .devcontainer/cuda${{ matrix.cuda }}-${{ matrix.pkgr }}/devcontainer.json
           env: |
-            REPOSITORY=${{ env.REPOSITORY }}
+            REPOSITORY="${{ inputs.repo }}"
             SCCACHE_REGION=${{ vars.AWS_REGION }}
             AWS_ACCESS_KEY_ID=${{ env.AWS_ACCESS_KEY_ID }}
             AWS_SESSION_TOKEN=${{ env.AWS_SESSION_TOKEN }}

From 85eb9ec4e8483893b57cab6ace8ca3dd2d73ec44 Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Thu, 18 Jan 2024 11:24:49 -0800
Subject: [PATCH 04/17] don't use subFolder

---
 .github/workflows/build-in-devcontainer.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/build-in-devcontainer.yaml b/.github/workflows/build-in-devcontainer.yaml
index dc0a505b..e1c9d3f0 100644
--- a/.github/workflows/build-in-devcontainer.yaml
+++ b/.github/workflows/build-in-devcontainer.yaml
@@ -74,7 +74,6 @@ jobs:
         uses: devcontainers/ci@v0.3
         with:
           push: never
-          subFolder: .devcontainer/cuda${{ matrix.cuda }}-${{ matrix.pkgr }}
           configFile: .devcontainer/cuda${{ matrix.cuda }}-${{ matrix.pkgr }}/devcontainer.json
           env: |
             REPOSITORY="${{ inputs.repo }}"

From 41e500a6ef9d43167a131a8e803653bbdd895db6 Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Thu, 18 Jan 2024 11:30:30 -0800
Subject: [PATCH 05/17] don't change directories

---
 .github/workflows/build-in-devcontainer.yaml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/workflows/build-in-devcontainer.yaml b/.github/workflows/build-in-devcontainer.yaml
index e1c9d3f0..adae9965 100644
--- a/.github/workflows/build-in-devcontainer.yaml
+++ b/.github/workflows/build-in-devcontainer.yaml
@@ -76,7 +76,6 @@ jobs:
           push: never
           configFile: .devcontainer/cuda${{ matrix.cuda }}-${{ matrix.pkgr }}/devcontainer.json
           env: |
-            REPOSITORY="${{ inputs.repo }}"
             SCCACHE_REGION=${{ vars.AWS_REGION }}
             AWS_ACCESS_KEY_ID=${{ env.AWS_ACCESS_KEY_ID }}
             AWS_SESSION_TOKEN=${{ env.AWS_SESSION_TOKEN }}
@@ -98,5 +97,4 @@ jobs:
               devcontainer-utils-init-ssh-deploy-keys || true;
             fi
 
-            cd ~/"${REPOSITORY}";
             ${{ inputs.build_command }}

From 7e6676cdec5faa889eae77bffc01ad011e84b97f Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Thu, 18 Jan 2024 11:54:35 -0800
Subject: [PATCH 06/17] define GH_TOKEN

---
 .github/workflows/build-in-devcontainer.yaml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/build-in-devcontainer.yaml b/.github/workflows/build-in-devcontainer.yaml
index adae9965..9b64a0eb 100644
--- a/.github/workflows/build-in-devcontainer.yaml
+++ b/.github/workflows/build-in-devcontainer.yaml
@@ -5,6 +5,9 @@ on:
         type: string
       repo:
         type: string
+      gh_token:
+        type: string
+        required: false
       node_type:
         type: string
         default: "cpu8"
@@ -80,6 +83,7 @@ jobs:
             AWS_ACCESS_KEY_ID=${{ env.AWS_ACCESS_KEY_ID }}
             AWS_SESSION_TOKEN=${{ env.AWS_SESSION_TOKEN }}
             AWS_SECRET_ACCESS_KEY=${{ env.AWS_SECRET_ACCESS_KEY }}
+            GH_TOKEN=${{ inputs.gh_token || secrets.GITHUB_TOKEN }}
           runCmd: |
             set -e;
 

From 8782b2541114efab020987a6bca582cb122c3f69 Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Thu, 18 Jan 2024 11:59:27 -0800
Subject: [PATCH 07/17] make gh_token the secret name

---
 .github/workflows/build-in-devcontainer.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build-in-devcontainer.yaml b/.github/workflows/build-in-devcontainer.yaml
index 9b64a0eb..9cd797d4 100644
--- a/.github/workflows/build-in-devcontainer.yaml
+++ b/.github/workflows/build-in-devcontainer.yaml
@@ -7,7 +7,7 @@ on:
         type: string
       gh_token:
         type: string
-        required: false
+        default: "GITHUB_TOKEN"
       node_type:
         type: string
         default: "cpu8"
@@ -79,11 +79,11 @@ jobs:
           push: never
           configFile: .devcontainer/cuda${{ matrix.cuda }}-${{ matrix.pkgr }}/devcontainer.json
           env: |
+            GH_TOKEN=${{ secrets[inputs.gh_token] }}
             SCCACHE_REGION=${{ vars.AWS_REGION }}
             AWS_ACCESS_KEY_ID=${{ env.AWS_ACCESS_KEY_ID }}
             AWS_SESSION_TOKEN=${{ env.AWS_SESSION_TOKEN }}
             AWS_SECRET_ACCESS_KEY=${{ env.AWS_SECRET_ACCESS_KEY }}
-            GH_TOKEN=${{ inputs.gh_token || secrets.GITHUB_TOKEN }}
           runCmd: |
             set -e;
 

From 3181cdbd053852b23f50f95e23f157ed0db3cafa Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Sun, 28 Jan 2024 23:53:51 -0800
Subject: [PATCH 08/17] set REPOSITORY envvar again, don't set -e

---
 .github/workflows/build-in-devcontainer.yaml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build-in-devcontainer.yaml b/.github/workflows/build-in-devcontainer.yaml
index 9cd797d4..170ed261 100644
--- a/.github/workflows/build-in-devcontainer.yaml
+++ b/.github/workflows/build-in-devcontainer.yaml
@@ -56,6 +56,7 @@ jobs:
           fetch-depth: 0
       - name: Check if repo has devcontainer
         run: |
+          echo "REPOSITORY=$(basename $(pwd))" | tee -a "${GITHUB_ENV}";
           if test -f .devcontainer/cuda${{ matrix.cuda }}-${{ matrix.pkgr }}/devcontainer.json; then
             echo "HAS_DEVCONTAINER=true" >> "${GITHUB_ENV}";
           else
@@ -79,14 +80,13 @@ jobs:
           push: never
           configFile: .devcontainer/cuda${{ matrix.cuda }}-${{ matrix.pkgr }}/devcontainer.json
           env: |
+            REPOSITORY=${{ env.REPOSITORY }}
             GH_TOKEN=${{ secrets[inputs.gh_token] }}
             SCCACHE_REGION=${{ vars.AWS_REGION }}
             AWS_ACCESS_KEY_ID=${{ env.AWS_ACCESS_KEY_ID }}
             AWS_SESSION_TOKEN=${{ env.AWS_SESSION_TOKEN }}
             AWS_SECRET_ACCESS_KEY=${{ env.AWS_SECRET_ACCESS_KEY }}
           runCmd: |
-            set -e;
-
             mkdir -p ~/.config/pip/;
             cat <<EOF >> ~/.config/pip/pip.conf
             [global]
@@ -101,4 +101,5 @@ jobs:
               devcontainer-utils-init-ssh-deploy-keys || true;
             fi
 
+            cd ~/"${REPOSITORY}";
             ${{ inputs.build_command }}

From 787115ad3135c05a77a779694abb83eea6a93ba7 Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Mon, 29 Jan 2024 10:17:09 -0800
Subject: [PATCH 09/17] do set -e and error on env creation again

---
 .github/workflows/build-in-devcontainer.yaml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build-in-devcontainer.yaml b/.github/workflows/build-in-devcontainer.yaml
index 170ed261..f4235e73 100644
--- a/.github/workflows/build-in-devcontainer.yaml
+++ b/.github/workflows/build-in-devcontainer.yaml
@@ -87,13 +87,14 @@ jobs:
             AWS_SESSION_TOKEN=${{ env.AWS_SESSION_TOKEN }}
             AWS_SECRET_ACCESS_KEY=${{ env.AWS_SECRET_ACCESS_KEY }}
           runCmd: |
+            set -e;
             mkdir -p ~/.config/pip/;
             cat <<EOF >> ~/.config/pip/pip.conf
             [global]
             extra-index-url = https://pypi.anaconda.org/rapidsai-wheels-nightly/simple
             EOF
 
-            rapids-make-${PYTHON_PACKAGE_MANAGER}-env || true;
+            rapids-make-${PYTHON_PACKAGE_MANAGER}-env;
 
             if ! grep -qE "^$" <<< "${{ inputs.extra-repo-deploy-key }}"; then
               if ! pgrep ssh-agent >/dev/null 2>&1; then eval "$(ssh-agent -s)"; fi;

From ef4f68da6521d58e272ed1dc10b9940bc28db071 Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Tue, 6 Feb 2024 10:34:16 -0800
Subject: [PATCH 10/17] remove GH_TOKEN input

---
 .github/workflows/build-in-devcontainer.yaml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.github/workflows/build-in-devcontainer.yaml b/.github/workflows/build-in-devcontainer.yaml
index f4235e73..3aad08f3 100644
--- a/.github/workflows/build-in-devcontainer.yaml
+++ b/.github/workflows/build-in-devcontainer.yaml
@@ -5,9 +5,6 @@ on:
         type: string
       repo:
         type: string
-      gh_token:
-        type: string
-        default: "GITHUB_TOKEN"
       node_type:
         type: string
         default: "cpu8"
@@ -81,7 +78,6 @@ jobs:
           configFile: .devcontainer/cuda${{ matrix.cuda }}-${{ matrix.pkgr }}/devcontainer.json
           env: |
             REPOSITORY=${{ env.REPOSITORY }}
-            GH_TOKEN=${{ secrets[inputs.gh_token] }}
             SCCACHE_REGION=${{ vars.AWS_REGION }}
             AWS_ACCESS_KEY_ID=${{ env.AWS_ACCESS_KEY_ID }}
             AWS_SESSION_TOKEN=${{ env.AWS_SESSION_TOKEN }}

From acf416dbb207db4e806a30cc5b08f4bf058bf3fe Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Tue, 6 Feb 2024 10:49:56 -0800
Subject: [PATCH 11/17] support two repo deploy keys

---
 .github/workflows/build-in-devcontainer.yaml | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build-in-devcontainer.yaml b/.github/workflows/build-in-devcontainer.yaml
index 3aad08f3..1a98450e 100644
--- a/.github/workflows/build-in-devcontainer.yaml
+++ b/.github/workflows/build-in-devcontainer.yaml
@@ -92,9 +92,14 @@ jobs:
 
             rapids-make-${PYTHON_PACKAGE_MANAGER}-env;
 
-            if ! grep -qE "^$" <<< "${{ inputs.extra-repo-deploy-key }}"; then
+            # Load private repo deploy keys
+            if ! grep -qE "^$" <<< "${{ inputs.extra-repo-deploy-key }}" \
+            || ! grep -qE "^$" <<< "${{ inputs.extra-repo-deploy-key-2 }}"; then
               if ! pgrep ssh-agent >/dev/null 2>&1; then eval "$(ssh-agent -s)"; fi;
-              ssh-add - <<< "${{ secrets[inputs.extra-repo-deploy-key] }}";
+              ssh-add - << "__EOF"
+            ${{ secrets[inputs.extra-repo-deploy-key] }}
+            ${{ secrets[inputs.extra-repo-deploy-key-2] }}
+            __EOF
               devcontainer-utils-init-ssh-deploy-keys || true;
             fi
 

From 62f0ee63859e1f1da69634f48cad88bfc5bc2292 Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Tue, 6 Feb 2024 10:51:40 -0800
Subject: [PATCH 12/17] add the input

---
 .github/workflows/build-in-devcontainer.yaml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.github/workflows/build-in-devcontainer.yaml b/.github/workflows/build-in-devcontainer.yaml
index 1a98450e..68010e07 100644
--- a/.github/workflows/build-in-devcontainer.yaml
+++ b/.github/workflows/build-in-devcontainer.yaml
@@ -16,6 +16,11 @@ on:
         required: false
         type: string
         default: ''
+      # Note that this is the _name_ of a secret containing the key, not the key itself.
+      extra-repo-deploy-key-2:
+        required: false
+        type: string
+        default: ''
 
 permissions:
   actions: read

From b5f6315c80fe66245d280fda76d8c401cb36da49 Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Tue, 6 Feb 2024 11:03:35 -0800
Subject: [PATCH 13/17] ssh-add with here-string

---
 .github/workflows/build-in-devcontainer.yaml | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/build-in-devcontainer.yaml b/.github/workflows/build-in-devcontainer.yaml
index 68010e07..47fca0a7 100644
--- a/.github/workflows/build-in-devcontainer.yaml
+++ b/.github/workflows/build-in-devcontainer.yaml
@@ -97,14 +97,15 @@ jobs:
 
             rapids-make-${PYTHON_PACKAGE_MANAGER}-env;
 
-            # Load private repo deploy keys
-            if ! grep -qE "^$" <<< "${{ inputs.extra-repo-deploy-key }}" \
-            || ! grep -qE "^$" <<< "${{ inputs.extra-repo-deploy-key-2 }}"; then
+            if test -n "${{ inputs.extra-repo-deploy-key }}" \
+            || test -n "${{ inputs.extra-repo-deploy-key-2 }}"; then
               if ! pgrep ssh-agent >/dev/null 2>&1; then eval "$(ssh-agent -s)"; fi;
-              ssh-add - << "__EOF"
-            ${{ secrets[inputs.extra-repo-deploy-key] }}
-            ${{ secrets[inputs.extra-repo-deploy-key-2] }}
-            __EOF
+              if test -n "${{ inputs.extra-repo-deploy-key }}"; then
+                ssh-add - <<< "${{ secrets[inputs.extra-repo-deploy-key] }}";
+              fi
+              if test -n "${{ inputs.extra-repo-deploy-key-2 }}"; then
+                ssh-add - <<< "${{ secrets[inputs.extra-repo-deploy-key-2] }}";
+              fi
               devcontainer-utils-init-ssh-deploy-keys || true;
             fi
 

From 4f1ac3f6c36df8593dbc4e7420738465078ea441 Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Wed, 7 Feb 2024 14:33:32 -0800
Subject: [PATCH 14/17] use single-quotes and grep with here strings

---
 .github/workflows/build-in-devcontainer.yaml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build-in-devcontainer.yaml b/.github/workflows/build-in-devcontainer.yaml
index 47fca0a7..895d52f5 100644
--- a/.github/workflows/build-in-devcontainer.yaml
+++ b/.github/workflows/build-in-devcontainer.yaml
@@ -97,14 +97,14 @@ jobs:
 
             rapids-make-${PYTHON_PACKAGE_MANAGER}-env;
 
-            if test -n "${{ inputs.extra-repo-deploy-key }}" \
-            || test -n "${{ inputs.extra-repo-deploy-key-2 }}"; then
+            if ! grep -qE "^$" <<< '${{ secrets[inputs.extra-repo-deploy-key] }}' \
+            || ! grep -qE "^$" <<< '${{ secrets[inputs.extra-repo-deploy-key-2] }}'; then
               if ! pgrep ssh-agent >/dev/null 2>&1; then eval "$(ssh-agent -s)"; fi;
-              if test -n "${{ inputs.extra-repo-deploy-key }}"; then
-                ssh-add - <<< "${{ secrets[inputs.extra-repo-deploy-key] }}";
+              if ! grep -qE "^$" <<< '${{ secrets[inputs.extra-repo-deploy-key] }}'; then
+                ssh-add - <<< '${{ secrets[inputs.extra-repo-deploy-key] }}';
               fi
-              if test -n "${{ inputs.extra-repo-deploy-key-2 }}"; then
-                ssh-add - <<< "${{ secrets[inputs.extra-repo-deploy-key-2] }}";
+              if ! grep -qE "^$" <<< '${{ secrets[inputs.extra-repo-deploy-key-2] }}'; then
+                ssh-add - <<< '${{ secrets[inputs.extra-repo-deploy-key-2] }}';
               fi
               devcontainer-utils-init-ssh-deploy-keys || true;
             fi

From 92d5b0438fd36127d83a77f3892431062a70ad7e Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Wed, 7 Feb 2024 15:08:12 -0800
Subject: [PATCH 15/17] Revert "use single-quotes and grep with here strings"

This reverts commit 4f1ac3f6c36df8593dbc4e7420738465078ea441.
---
 .github/workflows/build-in-devcontainer.yaml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build-in-devcontainer.yaml b/.github/workflows/build-in-devcontainer.yaml
index 895d52f5..47fca0a7 100644
--- a/.github/workflows/build-in-devcontainer.yaml
+++ b/.github/workflows/build-in-devcontainer.yaml
@@ -97,14 +97,14 @@ jobs:
 
             rapids-make-${PYTHON_PACKAGE_MANAGER}-env;
 
-            if ! grep -qE "^$" <<< '${{ secrets[inputs.extra-repo-deploy-key] }}' \
-            || ! grep -qE "^$" <<< '${{ secrets[inputs.extra-repo-deploy-key-2] }}'; then
+            if test -n "${{ inputs.extra-repo-deploy-key }}" \
+            || test -n "${{ inputs.extra-repo-deploy-key-2 }}"; then
               if ! pgrep ssh-agent >/dev/null 2>&1; then eval "$(ssh-agent -s)"; fi;
-              if ! grep -qE "^$" <<< '${{ secrets[inputs.extra-repo-deploy-key] }}'; then
-                ssh-add - <<< '${{ secrets[inputs.extra-repo-deploy-key] }}';
+              if test -n "${{ inputs.extra-repo-deploy-key }}"; then
+                ssh-add - <<< "${{ secrets[inputs.extra-repo-deploy-key] }}";
               fi
-              if ! grep -qE "^$" <<< '${{ secrets[inputs.extra-repo-deploy-key-2] }}'; then
-                ssh-add - <<< '${{ secrets[inputs.extra-repo-deploy-key-2] }}';
+              if test -n "${{ inputs.extra-repo-deploy-key-2 }}"; then
+                ssh-add - <<< "${{ secrets[inputs.extra-repo-deploy-key-2] }}";
               fi
               devcontainer-utils-init-ssh-deploy-keys || true;
             fi

From 5130757d1d2a9a0679f8ff713ae017cb8baa6853 Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Wed, 7 Feb 2024 15:09:03 -0800
Subject: [PATCH 16/17] use single-quotes

---
 .github/workflows/build-in-devcontainer.yaml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build-in-devcontainer.yaml b/.github/workflows/build-in-devcontainer.yaml
index 47fca0a7..7f0974b7 100644
--- a/.github/workflows/build-in-devcontainer.yaml
+++ b/.github/workflows/build-in-devcontainer.yaml
@@ -97,14 +97,14 @@ jobs:
 
             rapids-make-${PYTHON_PACKAGE_MANAGER}-env;
 
-            if test -n "${{ inputs.extra-repo-deploy-key }}" \
-            || test -n "${{ inputs.extra-repo-deploy-key-2 }}"; then
+            if test -n '${{ inputs.extra-repo-deploy-key }}' \
+            || test -n '${{ inputs.extra-repo-deploy-key-2 }}'; then
               if ! pgrep ssh-agent >/dev/null 2>&1; then eval "$(ssh-agent -s)"; fi;
-              if test -n "${{ inputs.extra-repo-deploy-key }}"; then
-                ssh-add - <<< "${{ secrets[inputs.extra-repo-deploy-key] }}";
+              if test -n '${{ inputs.extra-repo-deploy-key }}'; then
+                ssh-add - <<< '${{ secrets[inputs.extra-repo-deploy-key] }}';
               fi
-              if test -n "${{ inputs.extra-repo-deploy-key-2 }}"; then
-                ssh-add - <<< "${{ secrets[inputs.extra-repo-deploy-key-2] }}";
+              if test -n '${{ inputs.extra-repo-deploy-key-2 }}'; then
+                ssh-add - <<< '${{ secrets[inputs.extra-repo-deploy-key-2] }}';
               fi
               devcontainer-utils-init-ssh-deploy-keys || true;
             fi

From 82cd843d9b99f04875c06a6350b997bf3e771c4f Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Mon, 12 Feb 2024 13:52:54 -0800
Subject: [PATCH 17/17] support passing in arch and cuda versions as JSON
 arrays

---
 .github/workflows/build-in-devcontainer.yaml | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build-in-devcontainer.yaml b/.github/workflows/build-in-devcontainer.yaml
index 7f0974b7..7974dec3 100644
--- a/.github/workflows/build-in-devcontainer.yaml
+++ b/.github/workflows/build-in-devcontainer.yaml
@@ -3,6 +3,12 @@ on:
     inputs:
       sha:
         type: string
+      arch:
+        type: string
+        default: '["amd64"]'
+      cuda:
+        type: string
+        default: '["12.0"]'
       repo:
         type: string
       node_type:
@@ -42,8 +48,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        arch: ["amd64"]
-        cuda: ["12.0"]
+        arch: ${{ fromJSON(inputs.arch) }}
+        cuda: ${{ fromJSON(inputs.cuda) }}
         pkgr: ["conda", "pip"]
     runs-on: "linux-${{ matrix.arch }}-${{ inputs.node_type }}"
     steps: