diff options
author | zeshuai007 <51382517@qq.com> | 2020-10-26 11:49:46 +0800 |
---|---|---|
committer | Zezeng Wang <51382517@qq.com> | 2020-11-20 09:19:45 +0800 |
commit | 966da2992f8ed8e52bbbb84f266ceb5b9c159480 (patch) | |
tree | 9a44b5b7b707d66302f3dfca5938c47aaeb3c5c5 | |
parent | c8dab1f37a74cc52090ba4ce018a0d552dcc637d (diff) | |
download | thrift-966da2992f8ed8e52bbbb84f266ceb5b9c159480.tar.gz |
upgrade msys try get the soft
-rw-r--r-- | build/appveyor/MING-appveyor-install.bat | 17 | ||||
-rw-r--r-- | build/appveyor/MSYS-appveyor-install.bat | 2 |
2 files changed, 11 insertions, 8 deletions
diff --git a/build/appveyor/MING-appveyor-install.bat b/build/appveyor/MING-appveyor-install.bat index d06e0308c..4d49d4089 100644 --- a/build/appveyor/MING-appveyor-install.bat +++ b/build/appveyor/MING-appveyor-install.bat @@ -25,9 +25,6 @@ CALL cl_banner_install.bat || EXIT /B CALL cl_setenv.bat || EXIT /B CALL cl_showenv.bat || EXIT /B -SET BOOSTPKG=mingw-w64-x86_64-boost-1.71.0-1-any.pkg.tar.xz -SET IGNORE=--ignore mingw-w64-x86_64-boost - SET PACKAGES=^ --needed -S bison flex make ^ mingw-w64-%MINGWPLAT%-boost ^ @@ -50,7 +47,13 @@ SET PACKAGES=^ :: Upgrade things :: %BASH% -lc "pacman --noconfirm -Syu %IGNORE%" || EXIT /B :: %BASH% -lc "pacman --noconfirm -Su %IGNORE%" || EXIT /B -:: -%BASH% -lc "pacman -Scc" || EXIT /B -%BASH% -lc "pacman -Syyu" || EXIT /B -%BASH% -lc "pacman --noconfirm %PACKAGES%" || EXIT /B + +:: Updata the new key +%BASH% -lc "curl -O http://repo.msys2.org/msys/x86_64/msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz" || EXIT /B +%BASH% -lc "curl -O http://repo.msys2.org/msys/x86_64/msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz.sig" || EXIT /B +%BASH% -lc "pacman-key --verify msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz.sig" || EXIT /B +%BASH% -lc "pacman --noconfirm -U --config <(echo) msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz" || EXIT /B +:: Upgrade things +%BASH% -lc "pacman --noconfirm -Sy" || EXIT /B +%BASH% -lc "pacman --noconfirm -Sydd pacman" || EXIT /B +%BASH% -lc "pacman --noconfirm %PACKAGES%" || EXIT /B diff --git a/build/appveyor/MSYS-appveyor-install.bat b/build/appveyor/MSYS-appveyor-install.bat index 6357f2368..a818df305 100644 --- a/build/appveyor/MSYS-appveyor-install.bat +++ b/build/appveyor/MSYS-appveyor-install.bat @@ -26,7 +26,7 @@ CALL cl_setenv.bat || EXIT /B CALL cl_showenv.bat || EXIT /B :: We're going to keep boost at a version cmake understands -SET BOOSTPKG=mingw-w64-x86_64-boost-1.71.0-1-any.pkg.tar.xz +SET BOOSTPKG=mingw-w64-x86_64-boost-1.64.0-3-any.pkg.tar.xz SET IGNORE=--ignore mingw-w64-x86_64-boost SET PACKAGES=^ |