maryjane
/
gpodder
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

win_installer: remove conflicting packages instead of reinstalling the toolchain 

removing the toolchain broke deps
This commit is contained in:
Eric Le Lay 2019-06-08 18:54:58 +02:00
parent 48e2433ee7
commit cc3e0563fd
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.appveyor.yml
View File

@ -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"