From 4a505421abcb988ce74fd35ba40bf52274843b82 Mon Sep 17 00:00:00 2001
From: Jake Bailey <5341706+jakebailey@users.noreply.github.com>
Date: Wed, 10 Apr 2024 15:14:01 -0700
Subject: [PATCH] Use azure/cli action to run az

---
 .github/workflows/nightly.yml             | 10 ++++++----
 .github/workflows/pull_request_builds.yml | 10 ++++++----
 .github/workflows/ship_tags.yml           | 10 ++++++----
 3 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 6f8fabe..fafcbe9 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -29,7 +29,7 @@ jobs:
       
       # For Azure uploads
       - name: 'Az CLI login'
-        uses: azure/login@v1
+        uses: azure/login@v2
         with:
           client-id: ${{ secrets.AZURE_CLIENT_ID }}
           tenant-id: ${{ secrets.AZURE_TENANT_ID }}
@@ -41,6 +41,8 @@ jobs:
         run: node ./publish-monaco-editor.js next
 
       - name: Upload to Azure
-        env:
-          AZURE_STORAGE_ACCOUNT: ${{ secrets.AZURE_STORAGE_ACCOUNT }}
-        run: node ./upload-assets-to-blob-storage.js next
+        uses: azure/cli@v2
+        with:
+          inlineScript: |
+            export AZURE_STORAGE_ACCOUNT=${{ secrets.AZURE_STORAGE_ACCOUNT }}
+            node ./upload-assets-to-blob-storage.js next
diff --git a/.github/workflows/pull_request_builds.yml b/.github/workflows/pull_request_builds.yml
index 26f3c0e..4fc10ea 100644
--- a/.github/workflows/pull_request_builds.yml
+++ b/.github/workflows/pull_request_builds.yml
@@ -32,7 +32,7 @@ jobs:
 
       # For Azure uploads
       - name: 'Az CLI login'
-        uses: azure/login@v1
+        uses: azure/login@v2
         with:
           client-id: ${{ secrets.AZURE_CLIENT_ID }}
           tenant-id: ${{ secrets.AZURE_TENANT_ID }}
@@ -75,6 +75,8 @@ jobs:
           node pulls/comment-on-release.js $PULL_REQUEST_NUMBER $SEMVER_NUMBER
 
       - name: Upload to Azure
-        env:
-          AZURE_STORAGE_ACCOUNT: ${{ secrets.AZURE_STORAGE_ACCOUNT }}
-        run: node ./upload-assets-to-blob-storage.js
+        uses: azure/cli@v2
+        with:
+          inlineScript: |
+            export AZURE_STORAGE_ACCOUNT=${{ secrets.AZURE_STORAGE_ACCOUNT }}
+            node ./upload-assets-to-blob-storage.js
diff --git a/.github/workflows/ship_tags.yml b/.github/workflows/ship_tags.yml
index f2f30e1..a34c5ca 100644
--- a/.github/workflows/ship_tags.yml
+++ b/.github/workflows/ship_tags.yml
@@ -26,7 +26,7 @@ jobs:
 
       # For Azure uploads
       - name: 'Az CLI login'
-        uses: azure/login@v1
+        uses: azure/login@v2
         with:
           client-id: ${{ secrets.AZURE_CLIENT_ID }}
           tenant-id: ${{ secrets.AZURE_TENANT_ID }}
@@ -39,6 +39,8 @@ jobs:
         run: "node ./publish-monaco-editor.js $(echo $FULL_TAG_REF | cut -d/ -f3)"
 
       - name: Upload to Azure
-        env:
-          AZURE_STORAGE_ACCOUNT: ${{ secrets.AZURE_STORAGE_ACCOUNT }}
-        run: node ./upload-assets-to-blob-storage.js
+        uses: azure/cli@v2
+        with:
+          inlineScript: |
+            export AZURE_STORAGE_ACCOUNT=${{ secrets.AZURE_STORAGE_ACCOUNT }}
+            node ./upload-assets-to-blob-storage.js