From 39c1a2e60bc4dc5d7ef3ce69cf32af69082e746b Mon Sep 17 00:00:00 2001 From: Tanner Gooding Date: Fri, 10 Nov 2023 07:18:05 -0800 Subject: [PATCH] Update ci.yml to use the global.json for SDK installs --- .github/workflows/ci.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9485b984..6864fde8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -100,8 +100,8 @@ jobs: 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 + global-json-file: ./global.json + - run: dotnet tool install --tool-path ./artifacts/tools sign --version 0.9.1-beta.23530.1 - 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 ".NET Foundation" --description "ClangSharp" --description-url "https://github.com/dotnet/clangsharp" --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: @@ -141,8 +141,8 @@ jobs: 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 + global-json-file: ./global.json + - run: dotnet tool install --tool-path ./artifacts/tools sign --version 0.9.1-beta.23530.1 - 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 ".NET Foundation" --description "ClangSharp" --description-url "https://github.com/dotnet/clangsharp" --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: @@ -159,7 +159,7 @@ jobs: with: name: windows_release_x64 path: ./artifacts - - uses: actions/setup-dotnet@v2 + - uses: actions/setup-dotnet@v3 with: dotnet-version: '6.0.x' source-url: https://pkgs.clangsharp.dev/index.json @@ -175,7 +175,7 @@ jobs: with: name: windows_release_x64 path: ./artifacts - - uses: actions/setup-dotnet@v2 + - uses: actions/setup-dotnet@v3 with: dotnet-version: '6.0.x' - run: dotnet nuget push "./artifacts/pkg/Release/*.nupkg" --source https://nuget.pkg.github.com/dotnet/index.json --api-key ${{ secrets.GITHUB_TOKEN }} --skip-duplicate