aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRSDuck <RSDuck@users.noreply.github.com>2020-07-25 21:01:31 +0200
committerGitHub <noreply@github.com>2020-07-25 21:01:31 +0200
commitd13d2e9170c2c4ad15b2961006d20257e14750e9 (patch)
treed09641ee2e746dcde6efd4b98460a31c2a7fc341
parent8a96dfce18b8de93d8e6d5b21d7fa0ba9bbcab23 (diff)
parentacb1eec35d25c3af857cea5762d5ab0f5f24a5b8 (diff)
Merge pull request #680 from nadiaholmquist/patch-3
Windows CI: Install MSYS2 with chocolatey
-rw-r--r--.github/workflows/build-windows.yml3
1 files changed, 1 insertions, 2 deletions
diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml
index b8e8b04..035bc54 100644
--- a/.github/workflows/build-windows.yml
+++ b/.github/workflows/build-windows.yml
@@ -21,8 +21,7 @@ jobs:
- name: Install MSYS2
working-directory: ${{runner.workspace}}
run: | # Fetch MSYS2 build from XQEmu. Official distribution causes a CI failure due to permission errors.
- Invoke-WebRequest -Uri "https://github.com/xqemu/ci-environment-msys2/releases/latest/download/msys64.7z" -OutFile "msys64.7z"
- 7z x -y msys64.7z "-oC:\tools\"
+ choco install msys2
C:\tools\msys64\usr\bin\bash.exe -lc "pacman -Syuq --noconfirm"
- name: Install dependencies
run: C:\tools\msys64\usr\bin\bash.exe -lc "pacman -Sq --noconfirm git make mingw-w64-x86_64-{cmake,mesa,SDL2,qt5-static,toolchain}"