Resolve failures in signing job

Signed-off-by: Tanner Gooding <[email protected]>
terrafx · Feb 12, 2023 · eb6b1e2 · eb6b1e2
1 parent 7effadc
commit eb6b1e2
Showing 1 changed file with 6 additions and 18 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -54,21 +54,15 @@ jobs:
       id-token: write
     steps:
     - uses: actions/checkout@v3
-    - uses: actions/download-artifact@v2
+    - uses: actions/download-artifact@v3
       with:
         name: nuget_preview
         path: ./artifacts
     - uses: actions/setup-dotnet@v3
       with:
         dotnet-version: '6.0.x'
     - run: dotnet tool install --tool-path ./artifacts/tools sign --version 0.9.0-beta.23063.3
-    - uses: azure/login@v1
-      with:
-        allow-no-subscriptions: true
-        client-id: ${{ secrets.SC_AZURE_CLIENT_ID }}
-        tenant-id: ${{ secrets.SC_AZURE_TENANT_ID }}
-        subscription-id: ${{ secrets.SC_AZURE_SUBSCRIPTION_ID }}
-    - run: ./artifacts/tools/sign code azure-key-vault "**/*.nupkg" --timestamp-url "http://timestamp.digicert.com" --base-directory "${{ github.workspace }}/artifacts/pkg" --file-list "${{ github.workspace }}/scripts/SignClientFileList.txt" --publisher-name "TerraFX" --description "TerraFX.Interop.Windows" --description-url "https://github.com/terrafx/terrafx.interop.windows" --azure-key-vault-managed-identity true --azure-key-vault-url "${{ secrets.SC_KEY_VAULT_URL }}" --azure-key-vault-certificate "${{ secrets.SC_KEY_VAULT_CERTIFICATE_ID }}"
+    - run: ./artifacts/tools/sign code azure-key-vault "**/*.nupkg" --timestamp-url "http://timestamp.digicert.com" --base-directory "${{ github.workspace }}/artifacts/pkg" --file-list "${{ github.workspace }}/scripts/SignClientFileList.txt" --publisher-name "TerraFX" --description "TerraFX.Interop.Windows" --description-url "https://github.com/terrafx/terrafx.interop.windows" --azure-key-vault-certificate "${{ secrets.SC_KEY_VAULT_CERTIFICATE_ID }}" --azure-key-vault-client-id "${{ secrets.SC_AZURE_CLIENT_ID }}" --azure-key-vault-client-secret "${{ secrets.SC_AZURE_CLIENT_SECRET }}" --azure-key-vault-tenant-id "${{ secrets.SC_AZURE_TENANT_ID }}" --azure-key-vault-url "${{ secrets.SC_KEY_VAULT_URL }}"
     - uses: actions/upload-artifact@v3
       with:
         name: sign_nuget_preview
@@ -101,21 +95,15 @@ jobs:
       id-token: write
     steps:
     - uses: actions/checkout@v3
-    - uses: actions/download-artifact@v2
+    - uses: actions/download-artifact@v3
       with:
         name: nuget_release
         path: ./artifacts
     - uses: actions/setup-dotnet@v3
       with:
         dotnet-version: '6.0.x'
     - run: dotnet tool install --tool-path ./artifacts/tools sign --version 0.9.0-beta.23063.3
-    - uses: azure/login@v1
-      with:
-        allow-no-subscriptions: true
-        client-id: ${{ secrets.SC_AZURE_CLIENT_ID }}
-        tenant-id: ${{ secrets.SC_AZURE_TENANT_ID }}
-        subscription-id: ${{ secrets.SC_AZURE_SUBSCRIPTION_ID }}
-    - run: ./artifacts/tools/sign code azure-key-vault "**/*.nupkg" --timestamp-url "http://timestamp.digicert.com" --base-directory "${{ github.workspace }}/artifacts/pkg" --file-list "${{ github.workspace }}/scripts/SignClientFileList.txt" --publisher-name "TerraFX" --description "TerraFX.Interop.Windows" --description-url "https://github.com/terrafx/terrafx.interop.windows" --azure-key-vault-managed-identity true --azure-key-vault-url "${{ secrets.SC_KEY_VAULT_URL }}" --azure-key-vault-certificate "${{ secrets.SC_KEY_VAULT_CERTIFICATE_ID }}"
+    - run: ./artifacts/tools/sign code azure-key-vault "**/*.nupkg" --timestamp-url "http://timestamp.digicert.com" --base-directory "${{ github.workspace }}/artifacts/pkg" --file-list "${{ github.workspace }}/scripts/SignClientFileList.txt" --publisher-name "TerraFX" --description "TerraFX.Interop.Windows" --description-url "https://github.com/terrafx/terrafx.interop.windows" --azure-key-vault-certificate "${{ secrets.SC_KEY_VAULT_CERTIFICATE_ID }}" --azure-key-vault-client-id "${{ secrets.SC_AZURE_CLIENT_ID }}" --azure-key-vault-client-secret "${{ secrets.SC_AZURE_CLIENT_SECRET }}" --azure-key-vault-tenant-id "${{ secrets.SC_AZURE_TENANT_ID }}" --azure-key-vault-url "${{ secrets.SC_KEY_VAULT_URL }}"
     - uses: actions/upload-artifact@v3
       with:
         name: sign_nuget_release
@@ -127,7 +115,7 @@ jobs:
     if: ${{ github.event_name == 'push' }}
     needs: [ windows-x64, sign-nuget-preview, sign-nuget-release ]
     steps:
-    - uses: actions/download-artifact@v2
+    - uses: actions/download-artifact@v3
       with:
         name: windows_release_x64
         path: ./artifacts
@@ -143,7 +131,7 @@ jobs:
     if: ${{ github.event_name == 'push' }}
     needs: [ windows-x64, sign-nuget-preview, sign-nuget-release ]
     steps:
-    - uses: actions/download-artifact@v2
+    - uses: actions/download-artifact@v3
       with:
         name: windows_release_x64
         path: ./artifacts