From 5de72613b9cfd0c313a249a332b96eb069dca602 Mon Sep 17 00:00:00 2001 From: Biswapriyo Nath Date: Mon, 22 Feb 2021 19:01:24 +0530 Subject: appveyor: use latest build image for fixed MSYS2 installation As MSYS2 installer issues are fixed, remove the workaround from previous commits b8104a013d958e3f177891b22949fc2e66eab955 and ea91162802432aabc8a86216d56223f690e49a67 --- appveyor.yml | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 92f229aa3a..a385ac0364 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,3 +1,5 @@ +image: Visual Studio 2019 + branches: only: - master @@ -15,18 +17,8 @@ shallow_clone: true test: off install: - # Work around age/brokenness of Appveyor's msys2 by adding the new - # maintainer's keyring. - - 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 + # Disable checking disk space to speed up install time + - C:\msys64\usr\bin\sed -i 's/^CheckSpace/#CheckSpace/g' /etc/pacman.conf # Update core packages - C:\msys64\usr\bin\pacman -Syyuu --noconfirm --noprogressbar --ask=20 # Explicitly kill any remaining msys2 processes after core update -- cgit v1.2.3