You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@thrift.apache.org by ze...@apache.org on 2020/11/20 01:19:54 UTC
[thrift] branch master updated (6e6bb84 -> 966da29)
This is an automated email from the ASF dual-hosted git repository.
zeshuai007 pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/thrift.git.
from 6e6bb84 THRIFT-5288: Move Support for ByteBuffer into TTransport Client: Java Patch: David Mollitor
new 384a296 FixDownLoadErrorInCi
new a8770a9 rollback
new b6c886c FixDownLoadErrorInAppveyorCi
new c8dab1f try update the package to download the software
new 966da29 upgrade msys try get the soft
The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
build/appveyor/MING-appveyor-install.bat | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
[thrift] 03/05: FixDownLoadErrorInAppveyorCi
Posted by ze...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
zeshuai007 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/thrift.git
commit b6c886c940ff307a824b876c995676a894edb032
Author: zeshuai007 <51...@qq.com>
AuthorDate: Sat Oct 24 10:01:35 2020 +0800
FixDownLoadErrorInAppveyorCi
---
build/appveyor/MING-appveyor-install.bat | 4 ++++
build/appveyor/MSYS-appveyor-install.bat | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/build/appveyor/MING-appveyor-install.bat b/build/appveyor/MING-appveyor-install.bat
index 4b5d730..31b9bd7 100644
--- a/build/appveyor/MING-appveyor-install.bat
+++ b/build/appveyor/MING-appveyor-install.bat
@@ -25,6 +25,9 @@ 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 ^
@@ -49,3 +52,4 @@ SET PACKAGES=^
:: %BASH% -lc "pacman --noconfirm -Su %IGNORE%" || EXIT /B
::
%BASH% -lc "pacman --noconfirm %PACKAGES%" || EXIT /B
+%BASH% -lc "wget http://repo.msys2.org/mingw/x86_64/%BOOSTPKG% && pacman -- noconfirm --needed -U %BOOSTPKG% && rm %BOOKSTPKG%" || EXIT /B
diff --git a/build/appveyor/MSYS-appveyor-install.bat b/build/appveyor/MSYS-appveyor-install.bat
index a818df3..6357f23 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.64.0-3-any.pkg.tar.xz
+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=^
[thrift] 05/05: upgrade msys try get the soft
Posted by ze...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
zeshuai007 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/thrift.git
commit 966da2992f8ed8e52bbbb84f266ceb5b9c159480
Author: zeshuai007 <51...@qq.com>
AuthorDate: Mon Oct 26 11:49:46 2020 +0800
upgrade msys try get the soft
---
build/appveyor/MING-appveyor-install.bat | 17 ++++++++++-------
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 d06e030..4d49d40 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 6357f23..a818df3 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=^
[thrift] 04/05: try update the package to download the software
Posted by ze...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
zeshuai007 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/thrift.git
commit c8dab1f37a74cc52090ba4ce018a0d552dcc637d
Author: zeshuai007 <51...@qq.com>
AuthorDate: Mon Oct 26 10:50:28 2020 +0800
try update the package to download the software
---
build/appveyor/MING-appveyor-install.bat | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/build/appveyor/MING-appveyor-install.bat b/build/appveyor/MING-appveyor-install.bat
index 31b9bd7..d06e030 100644
--- a/build/appveyor/MING-appveyor-install.bat
+++ b/build/appveyor/MING-appveyor-install.bat
@@ -51,5 +51,6 @@ SET PACKAGES=^
:: %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
-%BASH% -lc "wget http://repo.msys2.org/mingw/x86_64/%BOOSTPKG% && pacman -- noconfirm --needed -U %BOOSTPKG% && rm %BOOKSTPKG%" || EXIT /B
[thrift] 02/05: rollback
Posted by ze...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
zeshuai007 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/thrift.git
commit a8770a9dd2f8d50cd0e67e18d7da69c45e5bd606
Author: zeshuai007 <51...@qq.com>
AuthorDate: Sat Oct 24 09:53:53 2020 +0800
rollback
---
build/appveyor/MSYS-appveyor-install.bat | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build/appveyor/MSYS-appveyor-install.bat b/build/appveyor/MSYS-appveyor-install.bat
index 6357f23..a818df3 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=^
[thrift] 01/05: FixDownLoadErrorInCi
Posted by ze...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
zeshuai007 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/thrift.git
commit 384a29616eb01854f85b353cd30d57cb5b83c4fc
Author: zeshuai007 <51...@qq.com>
AuthorDate: Sat Oct 24 09:49:54 2020 +0800
FixDownLoadErrorInCi
---
build/appveyor/MSYS-appveyor-install.bat | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build/appveyor/MSYS-appveyor-install.bat b/build/appveyor/MSYS-appveyor-install.bat
index a818df3..6357f23 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.64.0-3-any.pkg.tar.xz
+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=^