You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@thrift.apache.org by ns...@apache.org on 2016/02/28 04:06:53 UTC
[3/4] thrift git commit: THRIFT-3690 Work around docker image build
failures on Travis-CI Client: Build Patch: Nobuaki Sukegawa
THRIFT-3690 Work around docker image build failures on Travis-CI
Client: Build
Patch: Nobuaki Sukegawa
This closes #906
Project: http://git-wip-us.apache.org/repos/asf/thrift/repo
Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/2c5ed27a
Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/2c5ed27a
Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/2c5ed27a
Branch: refs/heads/master
Commit: 2c5ed27a25087f541312d35938056890c4784fc6
Parents: 103974e
Author: Nobuaki Sukegawa <ns...@apache.org>
Authored: Sat Feb 27 18:22:40 2016 +0900
Committer: Nobuaki Sukegawa <ns...@apache.org>
Committed: Sun Feb 28 12:04:05 2016 +0900
----------------------------------------------------------------------
.travis.yml | 4 ++--
build/docker/scripts/autotools.sh | 2 +-
build/docker/scripts/cmake.sh | 2 +-
build/docker/scripts/cross-test.sh | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/thrift/blob/2c5ed27a/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index 7aa6efb..51e9f47 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,9 +25,9 @@ services:
- docker
install:
- - docker pull thrift/$DISTRO:latest || true
+ - travis_wait docker pull thrift/$DISTRO:latest || true
- cp -r ./build/docker/scripts/*.sh ./build/docker/$DISTRO/scripts/
- - docker build -q -t thrift-build build/docker/$DISTRO
+ - travis_wait travis_retry docker build -q -t thrift-build build/docker/$DISTRO
script:
- docker run $BUILD_ENV -v $(pwd):/thrift/src -it thrift-build $BUILD_CMD $BUILD_ARG
http://git-wip-us.apache.org/repos/asf/thrift/blob/2c5ed27a/build/docker/scripts/autotools.sh
----------------------------------------------------------------------
diff --git a/build/docker/scripts/autotools.sh b/build/docker/scripts/autotools.sh
index 4c111e6..8388f72 100755
--- a/build/docker/scripts/autotools.sh
+++ b/build/docker/scripts/autotools.sh
@@ -3,4 +3,4 @@ set -ev
./bootstrap.sh
./configure $*
-make check -j4
+make check -j3
http://git-wip-us.apache.org/repos/asf/thrift/blob/2c5ed27a/build/docker/scripts/cmake.sh
----------------------------------------------------------------------
diff --git a/build/docker/scripts/cmake.sh b/build/docker/scripts/cmake.sh
index 8204a1d..0b92c5b 100755
--- a/build/docker/scripts/cmake.sh
+++ b/build/docker/scripts/cmake.sh
@@ -3,6 +3,6 @@ set -ev
mkdir -p cmake_build && cd cmake_build
cmake $* ..
-make -j4
+make -j3
cpack
ctest -VV -E "(concurrency_test|processor_test)"
http://git-wip-us.apache.org/repos/asf/thrift/blob/2c5ed27a/build/docker/scripts/cross-test.sh
----------------------------------------------------------------------
diff --git a/build/docker/scripts/cross-test.sh b/build/docker/scripts/cross-test.sh
index d9562ab..4da7813 100755
--- a/build/docker/scripts/cross-test.sh
+++ b/build/docker/scripts/cross-test.sh
@@ -3,7 +3,7 @@ set -ev
./bootstrap.sh
./configure --enable-tutorial=no
-make -j4 precross
+make -j3 precross
set +e
make cross