From bfbf18404d59d832c2a9dfa5dcd4714a58e8fc11 Mon Sep 17 00:00:00 2001 From: vit9696 Date: Wed, 4 Nov 2020 17:06:32 +0300 Subject: [PATCH] Run msys2 upgrade externally --- .appveyor.yml | 11 +++++++++++ unixbuild.sh | 5 ----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index b797f18..fe9b283 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -7,6 +7,17 @@ environment: clone_depth: 10 +install: + - set "PATH=C:\msys64\usr\bin;C:\msys64\mingw64\bin;C:\Windows\System32;C:\Windows;%PATH%" + - set MSYSTEM=MINGW64 + - bash -lc "curl -O http://repo.msys2.org/msys/x86_64/msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz" + - bash -lc "curl -O http://repo.msys2.org/msys/x86_64/msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz.sig" + - bash -lc "pacman-key --verify msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz.sig" + - bash -lc "pacman -U --noconfirm msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz" + - bash -lc "pacman -Syu --noconfirm" + - taskkill /f /fi "MODULES eq msys-2.0.dll" + - bash -lc "pacman -Syu --noconfirm" + build_script: - cd %APPVEYOR_BUILD_FOLDER% - set PATH=C:\msys64\mingw32\bin;C:\msys64\usr\bin;%PATH% diff --git a/unixbuild.sh b/unixbuild.sh index 6166400..2b33089 100755 --- a/unixbuild.sh +++ b/unixbuild.sh @@ -39,11 +39,6 @@ if [ "$UPLATFORM" = "mac" ]; then export PATH="/opt/qt56sm/bin:$PATH" elif [ "$UPLATFORM" = "win32" ]; then # Install missing dependencies - curl -O http://repo.msys2.org/msys/x86_64/msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz || exit 1 - curl -O http://repo.msys2.org/msys/x86_64/msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz.sig || exit 1 - pacman-key --verify msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz.sig || exit 1 - pacman -U --noconfirm msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz || exit 1 - pacman -Syu --ignore pacman --noconfirm || exit 1 pacman -S --noconfirm --needed zip unzip curl perl mingw-w64-i686-toolchain mingw-w64-i686-cmake || exit 1 # Fix PATH to support running shasum.