Run msys2 upgrade externally

This commit is contained in:
vit9696 2020-11-04 17:06:32 +03:00
parent 750b589575
commit bfbf18404d
2 changed files with 11 additions and 5 deletions

View file

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

View file

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