[appveyor] add build fix (#1520)

Add fix due to msys2/MSYS2-packages#1967

appveyor.yml

@@ -14,34 +14,25 @@ environment:
   CHERE_INVOKING: enabled_from_arguments
   matrix:
   - MSYSTEM: MINGW64
+    MSYS_PACKAGES: mingw-w64-x86_64-boost mingw-w64-x86_64-miniupnpc
+    MSYS_BITNESS: 64
   - MSYSTEM: MINGW32
+    MSYS_PACKAGES: mingw-w64-i686-boost mingw-w64-i686-miniupnpc
+    MSYS_BITNESS: 32
 
 install:
 - c:\msys64\usr\bin\bash -lc "pacman --noconfirm -Rns gcc-fortran gcc mingw-w64-{i686,x86_64}-gcc-ada mingw-w64-{i686,x86_64}-gcc-objc"
+# TODO: revert that change when appveyor's images will be updated
+- c:\msys64\usr\bin\bash -l "build/appveyor-msys2-upgrade.bash"
+# update runtime
 - c:\msys64\usr\bin\bash -lc "pacman --noconfirm -Syuu"
-
+# update packages and install required
-- c:\msys64\usr\bin\bash -lc "pacman --noconfirm -Syuu"
+- c:\msys64\usr\bin\bash -lc "pacman --noconfirm -Syuu ${MSYS_PACKAGES}"
-
-- if "%MSYSTEM%" == "MINGW64" (
-    c:\msys64\usr\bin\bash -lc "pacman --noconfirm -S mingw-w64-x86_64-boost mingw-w64-x86_64-miniupnpc"
-  ) else (
-    c:\msys64\usr\bin\bash -lc "pacman --noconfirm -S mingw-w64-i686-boost mingw-w64-i686-miniupnpc"
-  )
-
-- if "%MSYSTEM%" == "MINGW64" (
-    set "bitness=64"
-  ) else (
-    set "bitness=32"
-  )
 
 build_script:
-- cmd: >-
+- echo MSYSTEM = %MSYSTEM%, bitness = %MSYS_BITNESS%
-    cd \projects\i2pd
+- c:\msys64\usr\bin\bash -lc "make USE_UPNP=yes -j3"
-
+- 7z a -tzip -mx9 -mmt i2pd-mingw-win%MSYS_BITNESS%.zip i2pd.exe
-    echo MSYSTEM = %MSYSTEM%, bitness = %bitness%
-
-- c:\msys64\usr\bin\bash -lc "make USE_UPNP=yes -j2"
-- 7z a -tzip -mx9 -mmt i2pd-mingw-win%bitness%.zip i2pd.exe
 
 test: off
 

build/appveyor-msys2-upgrade.bash

@@ -0,0 +1,10 @@
+set -e -x
+
+base_url='http://repo.msys2.org/msys/x86_64/'
+packages="libzstd-1.4.4-2-x86_64.pkg.tar.xz pacman-5.2.1-6-x86_64.pkg.tar.xz zstd-1.4.4-2-x86_64.pkg.tar.xz"
+for p in $packages
+do
+    curl "${base_url}$p" -o "$p"
+done
+pacman -U --noconfirm $packages
+rm -f $packages