CI: put authentication in a script

microsoft · Apr 1, 2024 · ca835c6 · ca835c6
1 parent 995f686
commit ca835c6
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 4 deletions.
diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml
@@ -32,10 +32,7 @@ jobs:
         env:
           CLIENT_ID: ${{ fromJSON(secrets.AZURE_CREDENTIALS).clientId }}
           CLIENT_SECRET: ${{ fromJSON(secrets.AZURE_CREDENTIALS).clientSecret }}
-        run:
-          sudo curl -sL https://aka.ms/InstallAzureCLIDeb | bash && \
-          az acr login --name pcccr --username ${CLIENT_ID} --password ${CLIENT_SECRET} && \
-          docker login pcccr.azurecr.io --username ${CLIENT_ID} --password ${CLIENT_SECRET}
+        run: ./scripts/ciauthenticate
 
       - name: Publish images
         run: ./scripts/cipublish --acr pcccr --tag ${{steps.get_image_tag.outputs.tag}}

diff --git a/scripts/ciauthenticate b/scripts/ciauthenticate
@@ -0,0 +1,18 @@
+#!/bin/bash
+
+set -e
+
+if [[ "${CI}" ]]; then
+    set -x
+fi
+
+function usage() {
+    echo -n \
+        "Usage: $(basename "$0")
+CI authentication for this project.
+"
+}
+
+sudo curl -sL https://aka.ms/InstallAzureCLIDeb | bash
+az acr login --name pcccr --username ${CLIENT_ID} --password ${CLIENT_SECRET}
+docker login pcccr.azurecr.io --username ${CLIENT_ID} --password ${CLIENT_SECRET}