diff options
| author | Patrick Storz <eduard.braun2@gmx.de> | 2019-05-28 22:56:45 +0000 |
|---|---|---|
| committer | Patrick Storz <eduard.braun2@gmx.de> | 2019-05-28 22:56:45 +0000 |
| commit | 9d97563e2fab586ea511f7291ef6b2fe6c28c2b2 (patch) | |
| tree | 613acfd091b1aa9669679cb18597483dbf1cfd3e | |
| parent | CMake/MSYS2: Update dependencies (add libpdcurses) (diff) | |
| download | inkscape-9d97563e2fab586ea511f7291ef6b2fe6c28c2b2.tar.gz inkscape-9d97563e2fab586ea511f7291ef6b2fe6c28c2b2.zip | |
CI/AppVeyor: Work around MSYS2 update issue
| -rw-r--r-- | buildtools/appveyor.sh | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/buildtools/appveyor.sh b/buildtools/appveyor.sh index 2d4c15948..18a90bfbb 100644 --- a/buildtools/appveyor.sh +++ b/buildtools/appveyor.sh @@ -12,6 +12,9 @@ error() { echo -e "\e[1;31m\nError: ${1}\n\e[0m"; exit 1; } # reduce time required to install packages by disabling pacman's disk space checking sed -i 's/^CheckSpace/#CheckSpace/g' /etc/pacman.conf +# remove Ada and ObjC compilers (they cause update conflicts, see https://github.com/msys2/MINGW-packages/issues/5434) +pacman -R $MINGW_PACKAGE_PREFIX-gcc-{ada,objc} --noconfirm + # update MSYS2-packages and MINGW-packages (but only for current architecture) pacman -Quq | grep -v mingw-w64- | xargs pacman -S $PACMAN_OPTIONS pacman -Quq | grep ${MINGW_PACKAGE_PREFIX} | xargs pacman -S $PACMAN_OPTIONS |