From fe2fbdadf009c6c359689687a94595497b78d089 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Tue, 19 Nov 2024 00:18:09 +0100 Subject: [PATCH 1/6] fixup! ci: run Scalar's Functional Tests --- .github/workflows/scalar-functional-tests.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/scalar-functional-tests.yml b/.github/workflows/scalar-functional-tests.yml index da9f3a0d14bb2f..a5946bc33939d6 100644 --- a/.github/workflows/scalar-functional-tests.yml +++ b/.github/workflows/scalar-functional-tests.yml @@ -39,7 +39,7 @@ jobs: steps: - name: Check out Git's source code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Setup build tools on Windows if: runner.os == 'Windows' @@ -118,7 +118,7 @@ jobs: case "$(scalar version 2>&1)" in *.vfs.*) echo Good;; *) exit 1;; esac - name: Check out Scalar's source code - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 # Indicate full history so Nerdbank.GitVersioning works. path: scalar @@ -126,7 +126,7 @@ jobs: ref: ${{ env.SCALAR_REF }} - name: Setup .NET Core - uses: actions/setup-dotnet@v3 + uses: actions/setup-dotnet@v4 with: dotnet-version: '3.1.x' From 62c8d6be26bf56bf1c13cb18c7b250879692d5ca Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Tue, 19 Nov 2024 00:18:02 +0100 Subject: [PATCH 2/6] fixup! release: create draft GitHub release with packages & installers --- .github/workflows/build-git-installers.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-git-installers.yml b/.github/workflows/build-git-installers.yml index 74180f14c7073a..9674648658359e 100644 --- a/.github/workflows/build-git-installers.yml +++ b/.github/workflows/build-git-installers.yml @@ -721,7 +721,7 @@ jobs: | sed -e 's/^"//' -e 's/"$//' | base64 -d >msft-git-public.asc mv msft-git-public.asc deb-package - - uses: actions/github-script@v6 + - uses: actions/github-script@v7 with: script: | const fs = require('fs'); From 6b71f686f3261f3e6085ce11195e9f34ae568011 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Tue, 19 Nov 2024 00:14:30 +0100 Subject: [PATCH 3/6] fixup! release: add signing step for .deb package --- .github/workflows/build-git-installers.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-git-installers.yml b/.github/workflows/build-git-installers.yml index 9674648658359e..1b2dbc860db4e3 100644 --- a/.github/workflows/build-git-installers.yml +++ b/.github/workflows/build-git-installers.yml @@ -547,7 +547,7 @@ jobs: mv "$PKGNAME.deb" "$GITHUB_WORKSPACE" - name: Log into Azure - uses: azure/login@v1 + uses: azure/login@v2 with: client-id: ${{ secrets.AZURE_CLIENT_ID }} tenant-id: ${{ secrets.AZURE_TENANT_ID }} From af8b9e7b8ea7bf09f1643d1febf9635fa6a25e8a Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Tue, 19 Nov 2024 00:17:47 +0100 Subject: [PATCH 4/6] fixup! build-git-installers: publish gpg public key --- .github/workflows/build-git-installers.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-git-installers.yml b/.github/workflows/build-git-installers.yml index 1b2dbc860db4e3..a177e7ba2e295d 100644 --- a/.github/workflows/build-git-installers.yml +++ b/.github/workflows/build-git-installers.yml @@ -708,7 +708,7 @@ jobs: path: deb-package - name: Log into Azure - uses: azure/login@v1 + uses: azure/login@v2 with: client-id: ${{ secrets.AZURE_CLIENT_ID }} tenant-id: ${{ secrets.AZURE_TENANT_ID }} From e33cfa5717c0f3f417a76458336666014c1f3c83 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Tue, 19 Nov 2024 00:18:04 +0100 Subject: [PATCH 5/6] fixup! homebrew: add GitHub workflow to release Cask --- .github/workflows/release-homebrew.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-homebrew.yml b/.github/workflows/release-homebrew.yml index 21da86e328f6e4..e00b90d8c07579 100644 --- a/.github/workflows/release-homebrew.yml +++ b/.github/workflows/release-homebrew.yml @@ -40,7 +40,7 @@ jobs: sed s/^/result=/ >$GITHUB_OUTPUT && rm token - name: Update scalar Cask - uses: mjcheetham/update-homebrew@v1.3 + uses: mjcheetham/update-homebrew@v1.4 with: token: ${{ steps.token.outputs.result }} tap: microsoft/git From 85da6ef952d46aeff526e3ecb5c24abb92aaebab Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Tue, 19 Nov 2024 00:18:07 +0100 Subject: [PATCH 6/6] fixup! winget: switch to using an Azure KeyVault --- .github/workflows/release-winget.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-winget.yml b/.github/workflows/release-winget.yml index e55932dbcb2855..d6edab844d05b5 100644 --- a/.github/workflows/release-winget.yml +++ b/.github/workflows/release-winget.yml @@ -19,7 +19,7 @@ jobs: environment: release steps: - name: Log into Azure - uses: azure/login@v1 + uses: azure/login@v2 with: client-id: ${{ secrets.AZURE_CLIENT_ID }} tenant-id: ${{ secrets.AZURE_TENANT_ID }}