From 8b16aaa546db92f9884dbd94ffa56ec5c028c207 Mon Sep 17 00:00:00 2001 From: Thomas Eizinger Date: Mon, 24 Nov 2025 11:42:57 +1100 Subject: [PATCH] ci: install dotnet v10 (#10937) A new version of the `AzureSignTool` appears to require a dotnet version that is not yet installed on the GitHub runners. Ideally we would be managing this via `.tool-versions` but that needs a bit more work, see the CI failures in #10936. --- .github/actions/setup-azure-sign-tool/action.yml | 13 +++++++++++++ .github/workflows/_data-plane.yml | 4 +--- .github/workflows/_tauri.yml | 5 +---- 3 files changed, 15 insertions(+), 7 deletions(-) create mode 100644 .github/actions/setup-azure-sign-tool/action.yml diff --git a/.github/actions/setup-azure-sign-tool/action.yml b/.github/actions/setup-azure-sign-tool/action.yml new file mode 100644 index 000000000..c36cb2563 --- /dev/null +++ b/.github/actions/setup-azure-sign-tool/action.yml @@ -0,0 +1,13 @@ +name: "Setup AzureSignTool" +description: "Installs the AzureSignTool" +runs: + using: "composite" + steps: + - uses: actions/setup-dotnet@d4c94342e560b34958eacfc5d055d21461ed1c5d # v5.0.0 + if: ${{ runner.os == 'Windows' }} + with: + dotnet-version: "10.0.x" + - name: Install AzureSignTool + if: ${{ runner.os == 'Windows' }} + shell: bash + run: dotnet tool install --global AzureSignTool diff --git a/.github/workflows/_data-plane.yml b/.github/workflows/_data-plane.yml index 4229f7799..0345fcd51 100644 --- a/.github/workflows/_data-plane.yml +++ b/.github/workflows/_data-plane.yml @@ -139,9 +139,7 @@ jobs: cargo build $PROFILE -p ${{ matrix.package }} --target ${{ matrix.target }} mv target/${{ matrix.target }}/${{ inputs.profile }}/${{ matrix.package }}.exe "$ARTIFACT_PATH" - - name: Install AzureSignTool - shell: bash - run: dotnet tool install --global AzureSignTool + - uses: ./.github/actions/setup-azure-sign-tool - name: Sign the binary shell: bash env: diff --git a/.github/workflows/_tauri.yml b/.github/workflows/_tauri.yml index dbcf82759..4674c8d26 100644 --- a/.github/workflows/_tauri.yml +++ b/.github/workflows/_tauri.yml @@ -151,10 +151,7 @@ jobs: organization: firezone-inc - name: Install pnpm deps run: pnpm install - - name: Install AzureSignTool - if: ${{ runner.os == 'Windows' }} - shell: bash - run: dotnet tool install --global AzureSignTool + - uses: ./.github/actions/setup-azure-sign-tool - name: Build release exe and MSI / deb env: CARGO_PROFILE_RELEASE_LTO: thin # Fat LTO is getting too slow / RAM-hungry on Tauri builds