Merge pull request #1086 from gpodder/win-fix-appveyor
Update appveyor image to VS2019
This commit is contained in:
commit
79ef6aa8a2
|
@ -6,6 +6,9 @@ branches:
|
|||
# Start builds on tags only
|
||||
# skip_non_tags: true
|
||||
|
||||
image:
|
||||
- Visual Studio 2019
|
||||
|
||||
environment:
|
||||
matrix:
|
||||
- MSYS2_ARCH: i686
|
||||
|
@ -15,17 +18,8 @@ build_script:
|
|||
- set
|
||||
- set PATH=C:\msys64\%MSYSTEM%\bin;C:\msys64\usr\bin;%PATH%
|
||||
- set CHERE_INVOKING=yes
|
||||
# workaround new msys2 packagers
|
||||
- curl -O http://repo.msys2.org/msys/x86_64/msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz
|
||||
- curl -O http://repo.msys2.org/msys/x86_64/msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz.sig
|
||||
- bash -lc "pacman-key --verify msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz.sig"
|
||||
- bash -lc "pacman --noconfirm -U msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz"
|
||||
# remove precisely conflicting packages
|
||||
- bash -lc "pacman --noconfirm --ask 20 --remove mingw-w64-x86_64-gcc-ada mingw-w64-x86_64-gcc-objc mingw-w64-i686-gcc-ada mingw-w64-i686-gcc-objc"
|
||||
# https://www.msys2.org/news/#2020-12-26-zstd-exemption-for-core-packages-removed
|
||||
- bash -lc "pacman --noconfirm -U 'http://repo.msys2.org/msys/x86_64/libzstd-1.4.4-2-x86_64.pkg.tar.xz'"
|
||||
- bash -lc "pacman --noconfirm -U 'http://repo.msys2.org/msys/x86_64/zstd-1.4.4-2-x86_64.pkg.tar.xz'"
|
||||
- bash -lc "pacman --noconfirm -U 'http://repo.msys2.org/msys/x86_64/pacman-5.2.1-6-x86_64.pkg.tar.xz'"
|
||||
# workaround updating msys2-runtime breaks all programs until last one exited
|
||||
- bash -lc "pacman -Syuu --noconfirm"
|
||||
- Powershell.exe "Stop-Process -name dirmngr -Erroraction silentlycontinue; echo killing_dirmng"
|
||||
|
|
Loading…
Reference in New Issue