From 0c3c8d749ec9c5412cb5768f7f0a2d4a7cabb7d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Cortier?= Date: Thu, 1 Aug 2024 10:23:16 -0400 Subject: [PATCH] ci: download Cadeau only on Windows in package workflow (#960) --- .github/workflows/package.yml | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml index aae44b18c..2bed65781 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -240,17 +240,15 @@ jobs: $Destination = Join-Path "webapp" "client" gh run download ${{ needs.preflight.outputs.run }} -n webapp-client -D "$Destination" - - name: Download Cadeau - shell: pwsh - run: | - $Platform = @{'windows'='win'; 'linux'='linux'}['${{ matrix.os }}'] - $Arch = 'x64' - ./ci/download-cadeau.ps1 -Platform $Platform -Architecture $Arch - - name: Add msbuild to PATH if: matrix.os == 'windows' && (matrix.project == 'devolutions-gateway' || matrix.project == 'devolutions-agent') uses: microsoft/setup-msbuild@v2 + - name: Download Cadeau + if: matrix.project == 'devolutions-gateway' && matrix.os == 'windows' + shell: pwsh + run: ./ci/download-cadeau.ps1 -Platform 'win' -Architecture 'x64' + - name: Regenerate Gateway MSI if: matrix.project == 'devolutions-gateway' && matrix.os == 'windows' shell: pwsh