From cc3e0563fd1634eea450e3871a7f83440d38da5d Mon Sep 17 00:00:00 2001 From: Eric Le Lay Date: Sat, 8 Jun 2019 18:54:58 +0200 Subject: [PATCH] win_installer: remove conflicting packages instead of reinstalling the toolchain removing the toolchain broke deps --- .appveyor.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index c0307df4..183df5ae 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -17,9 +17,7 @@ build_script: - set CHERE_INVOKING=yes - bash -lc "pacman --noconfirm --ask 20 -Suy" # 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" - # fresh toolchain reinstall (most will get updated anyway) - - bash -lc "pacman --noconfirm --ask 20 --remove mingw-w64-i686-toolchain mingw-w64-x86_64-toolchain" + - 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" # rerun per the "terminate MSYS2 without returning to shell and check for updates again" message - bash -lc "pacman --noconfirm --ask 20 -Suy" - bash -lc "bash .appveyor/msys2.sh"