summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEduard Braun <eduard.braun2@gmx.de>2017-09-30 19:29:31 +0000
committerEduard Braun <eduard.braun2@gmx.de>2017-09-30 20:21:17 +0000
commita95dbdc461bd956145a2bf244f8b20342aa6836f (patch)
tree51491e20fc5db463f945ac92b4706a6c1bfc3565
parentMSYS2: use custom ImageMagick build as relocation support is broken (diff)
downloadinkscape-a95dbdc461bd956145a2bf244f8b20342aa6836f.tar.gz
inkscape-a95dbdc461bd956145a2bf244f8b20342aa6836f.zip
CI/AppVeyor: Re-introduce full system upgrade
It was disabled in 657285e593dc1b901203bd797c335e87672e3d26 to reduce build times. Unfortunately pacman does not update dependencies of installed packages, so if a dependency is already present on the build machine an outdated (and potentially incompatible) version will be used. For an example of such breakage, see https://github.com/Alexpux/MSYS2-packages/pull/1020 https://github.com/appveyor/ci/issues/1822
-rw-r--r--buildtools/appveyor.sh7
1 files changed, 7 insertions, 0 deletions
diff --git a/buildtools/appveyor.sh b/buildtools/appveyor.sh
index 5dac1227f..d8dddb104 100644
--- a/buildtools/appveyor.sh
+++ b/buildtools/appveyor.sh
@@ -9,6 +9,13 @@ error() { echo -e "\e[1;31m\nError: ${1}\n\e[0m"; exit 1; }
### setup
+# reduce time required to install packages by disabling pacman's disk space checking
+sed -i 's/^CheckSpace/#CheckSpace/g' /etc/pacman.conf
+
+# update MSYS2-packages and MINGW-packages (but only for current architecture)
+pacman -Quq | grep -v mingw-w64- | xargs pacman -S --needed --noconfirm --noprogressbar
+pacman -Quq | grep ${MINGW_PACKAGE_PREFIX} | xargs pacman -S --needed --noconfirm --noprogressbar
+
# do everything in /build
cd "$(cygpath ${APPVEYOR_BUILD_FOLDER})"
mkdir build