You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@thrift.apache.org by jk...@apache.org on 2019/06/21 15:21:49 UTC
[thrift] branch master updated: Fix mingw appveyor build issue
[skip travis]
This is an automated email from the ASF dual-hosted git repository.
jking pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/thrift.git
The following commit(s) were added to refs/heads/master by this push:
new a85d532 Fix mingw appveyor build issue [skip travis]
a85d532 is described below
commit a85d532bb397ecfab59afa079da1fe776548af08
Author: James E. King III <jk...@apache.org>
AuthorDate: Mon Jun 17 04:06:41 2019 -0400
Fix mingw appveyor build issue [skip travis]
---
build/appveyor/MING-appveyor-install.bat | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/build/appveyor/MING-appveyor-install.bat b/build/appveyor/MING-appveyor-install.bat
index 1069b05..4b5d730 100644
--- a/build/appveyor/MING-appveyor-install.bat
+++ b/build/appveyor/MING-appveyor-install.bat
@@ -36,10 +36,16 @@ SET PACKAGES=^
::mingw-w64-%MINGWPLAT%-qt5 : WAY too large (1GB download!) - tested in cygwin builds anyway
+:: the following uninstall and system upgrade was causing issues; appveyor's is relatively new
:: Remove old packages that no longer exist to avoid an error
-%BASH% -lc "pacman --noconfirm --remove libcatgets catgets || true" || EXIT /B
+:: %BASH% -lc "pacman --noconfirm --remove libcatgets catgets || true" || EXIT /B
+
+:: Remove incompatible packages 8.2.0-3 and 7.3.0-2 (mingw packaging bugs if you ask me!)
+:: %BASH% -lc "pacman --noconfirm --remove mingw-w64-x86_64-gcc-ada mingw-w64-x86_64-gcc-objc || true" || EXIT /B
+:: %BASH% -lc "pacman --noconfirm --remove mingw-w64-x86_64-gcc-ada mingw-w64-x86_64-gcc-objc || true" || EXIT /B
:: Upgrade things
-%BASH% -lc "pacman --noconfirm -Syu %IGNORE%" || EXIT /B
-%BASH% -lc "pacman --noconfirm -Su %IGNORE%" || EXIT /B
-%BASH% -lc "pacman --noconfirm %PACKAGES%" || EXIT /B
\ No newline at end of file
+:: %BASH% -lc "pacman --noconfirm -Syu %IGNORE%" || EXIT /B
+:: %BASH% -lc "pacman --noconfirm -Su %IGNORE%" || EXIT /B
+::
+%BASH% -lc "pacman --noconfirm %PACKAGES%" || EXIT /B