diff options
| author | Bjørn Christian Seime <bjorncs@oath.com> | 2017-10-02 12:13:42 +0200 |
|---|---|---|
| committer | Bjørn Christian Seime <bjorncs@oath.com> | 2017-10-02 12:13:42 +0200 |
| commit | 507da102402b558be886c5141a035d5b5e0046f2 (patch) | |
| tree | 4fb9877c247141aed8b96ecf0e57eaab01e6ef19 /travis | |
| parent | 0a72e3652d88d6d5af343a8a6d9fc6a478296d0b (diff) | |
Source devtoolset-6.sh to use new Maven binary
Diffstat (limited to 'travis')
| -rwxr-xr-x | travis/travis-build-cpp.sh | 1 | ||||
| -rwxr-xr-x | travis/travis-build-java.sh | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/travis/travis-build-cpp.sh b/travis/travis-build-cpp.sh index 825da67bf54..bc2b564d13f 100755 --- a/travis/travis-build-cpp.sh +++ b/travis/travis-build-cpp.sh @@ -11,6 +11,7 @@ export CCACHE_MAXSIZE="1250M" export CCACHE_COMPRESS=1 NUM_THREADS=4 ccache --print-config +source /etc/profile.d/devtoolset-6.sh || true cd ${BUILD_DIR} bash ${SOURCE_DIR}/bootstrap-cpp.sh ${SOURCE_DIR} ${BUILD_DIR} diff --git a/travis/travis-build-java.sh b/travis/travis-build-java.sh index 68341d784b5..a7b9f425758 100755 --- a/travis/travis-build-java.sh +++ b/travis/travis-build-java.sh @@ -7,5 +7,6 @@ NUM_THREADS=4 cd "${SOURCE_DIR}" export MAVEN_OPTS="-Xms128m -Xmx512m" +source /etc/profile.d/devtoolset-6.sh || true sh ./bootstrap.sh java mvn install -nsu -B -T ${NUM_THREADS} -V # Should ideally split out test phase, but some unit tests fails on 'mvn test' |