diff options
| author | erw7 <erw7.github@gmail.com> | 2020-11-01 11:19:46 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-01 11:19:46 +0900 |
| commit | ca7449db46062098cc9b0c84401655cba7d3a53f (patch) | |
| tree | 88fdca935bc6d1e42dcbcc80785f0d77fed54e4d | |
| parent | bc68653a869645e45f52edbf296106be5deabf2f (diff) | |
| parent | 29deb5dc315f19fe6c5cb5c7b1787b1a2cd2c8d6 (diff) | |
| download | rneovim-ca7449db46062098cc9b0c84401655cba7d3a53f.tar.gz rneovim-ca7449db46062098cc9b0c84401655cba7d3a53f.tar.bz2 rneovim-ca7449db46062098cc9b0c84401655cba7d3a53f.zip | |
Merge pull request #13163 from erw7/fix-appveyor
ci/appveyor: change to update package database
| -rw-r--r-- | ci/build.ps1 | 9 | ||||
| -rw-r--r-- | third-party/cmake/GetBinaryDeps.cmake | 1 |
2 files changed, 8 insertions, 2 deletions
diff --git a/ci/build.ps1 b/ci/build.ps1 index 08fc76393d..dbc43aecf3 100644 --- a/ci/build.ps1 +++ b/ci/build.ps1 @@ -91,7 +91,14 @@ if ($compiler -eq 'MINGW') { & C:\msys64\usr\bin\mkdir -p /var/cache/pacman/pkg # Build third-party dependencies - C:\msys64\usr\bin\bash -lc "pacman --verbose --noconfirm -Su" ; exitIfFailed + C:\msys64\usr\bin\bash -lc "curl -O http://repo.msys2.org/msys/x86_64/msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz" ; exitIfFailed + C:\msys64\usr\bin\bash -lc "curl -O http://repo.msys2.org/msys/x86_64/msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz.sig" ; exitIfFailed + C:\msys64\usr\bin\bash -lc "pacman-key --verify msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz.sig" ; exitIfFailed + C:\msys64\usr\bin\bash -lc "pacman --verbose --noconfirm -U msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz" ; exitIfFailed + # If there are still processes using msys-2.0.dll, after the base system update is finished, it will wait for input from the user. + # To prevent this, we will terminate all processes that use msys-2.0.dll. + Get-Process | Where-Object { $_.path -like 'C:\msys64*' } | Stop-Process + C:\msys64\usr\bin\bash -lc "pacman --verbose --noconfirm -Syu" ; exitIfFailed C:\msys64\usr\bin\bash -lc "pacman --verbose --noconfirm --needed -S $mingwPackages" ; exitIfFailed } elseif ($compiler -eq 'MSVC') { diff --git a/third-party/cmake/GetBinaryDeps.cmake b/third-party/cmake/GetBinaryDeps.cmake index f262ae7159..982bf62265 100644 --- a/third-party/cmake/GetBinaryDeps.cmake +++ b/third-party/cmake/GetBinaryDeps.cmake @@ -39,7 +39,6 @@ function(GetBinaryDep) -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/DownloadAndExtractFile.cmake CONFIGURE_COMMAND "" BUILD_IN_SOURCE 1 - CONFIGURE_COMMAND "" BUILD_COMMAND "" INSTALL_COMMAND ${CMAKE_COMMAND} -E make_directory ${DEPS_INSTALL_DIR}/bin COMMAND "${_gettool_INSTALL_COMMAND}") |