appveyor: use latest build image for fixed MSYS2 installation

As MSYS2 installer issues are fixed, remove the workaround from previous commits
b8104a013d and ea91162802
This commit is contained in:
Biswapriyo Nath 2021-02-22 19:01:24 +05:30 committed by Jan Ekström
parent 26ec0e3d46
commit 5de72613b9
1 changed files with 4 additions and 12 deletions

View File

@ -1,3 +1,5 @@
image: Visual Studio 2019
branches: branches:
only: only:
- master - master
@ -15,18 +17,8 @@ shallow_clone: true
test: off test: off
install: install:
# Work around age/brokenness of Appveyor's msys2 by adding the new # Disable checking disk space to speed up install time
# maintainer's keyring. - C:\msys64\usr\bin\sed -i 's/^CheckSpace/#CheckSpace/g' /etc/pacman.conf
- bash -lc "curl -O http://repo.msys2.org/msys/x86_64/msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz"
- bash -lc "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 -U --noconfirm msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz"
# Support for Ada and Objective-C was removed from MSYS2. GCC won't update if
# these packages are installed.
- >-
C:\msys64\usr\bin\pacman -R --noconfirm --noprogressbar
mingw-w64-i686-gcc-ada mingw-w64-i686-gcc-objc mingw-w64-x86_64-gcc-ada
mingw-w64-x86_64-gcc-objc
# Update core packages # Update core packages
- C:\msys64\usr\bin\pacman -Syyuu --noconfirm --noprogressbar --ask=20 - C:\msys64\usr\bin\pacman -Syyuu --noconfirm --noprogressbar --ask=20
# Explicitly kill any remaining msys2 processes after core update # Explicitly kill any remaining msys2 processes after core update