From 89ebc7defa9dd3d8e29db862dce40bdd7f78e9f3 Mon Sep 17 00:00:00 2001 From: alemuntoni Date: Mon, 7 Feb 2022 18:02:39 +0100 Subject: [PATCH] update windows workflows to work properly with windows server 2022 --- .github/workflows/CreateRelease.yml | 7 ++++--- .github/workflows/Windows.yml | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/workflows/CreateRelease.yml b/.github/workflows/CreateRelease.yml index af4e141c7..5fc4dca3c 100644 --- a/.github/workflows/CreateRelease.yml +++ b/.github/workflows/CreateRelease.yml @@ -177,16 +177,17 @@ jobs: echo ::set-output name=artifact_suffix::"" fi echo "VCINSTALLDIR=C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC" >> $GITHUB_ENV - - name: Expand PATH for wget + - name: Install wget run: | - echo "C:\msys64\usr\bin\" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append + $env:PATH = "C:\msys64\mingw64\bin;C:\msys64\usr\bin" + pacman.exe -S --noconfirm --noprogressbar wget - name: Set Certificate run: | New-Item -ItemType directory -Path certificate Set-Content -Path certificate\certificate.txt -Value '${{ secrets.WIN_CERTIFICATE }}' certutil -decode certificate\certificate.txt certificate\certificate.pfx - name: Download external libraries - shell: bash + shell: C:\shells\msys2bash.cmd {0} run: | bash scripts/${{ runner.os }}/0_download_ext.sh - name: Configure and Build diff --git a/.github/workflows/Windows.yml b/.github/workflows/Windows.yml index b57aa7f25..ce5833288 100644 --- a/.github/workflows/Windows.yml +++ b/.github/workflows/Windows.yml @@ -28,11 +28,12 @@ jobs: echo ::set-output name=artifact_suffix::"" fi echo "VCINSTALLDIR=C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC" >> $GITHUB_ENV - - name: Expand PATH for wget + - name: Install wget run: | - echo "C:\msys64\usr\bin\" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append + $env:PATH = "C:\msys64\mingw64\bin;C:\msys64\usr\bin" + pacman.exe -S --noconfirm --noprogressbar wget - name: Download external libraries - shell: bash + shell: C:\shells\msys2bash.cmd {0} run: | bash scripts/${{ runner.os }}/0_download_ext.sh - name: Configure and Build