diff options
author | Bjørn Christian Seime <bjorncs@oath.com> | 2017-10-19 10:55:53 +0200 |
---|---|---|
committer | Bjørn Christian Seime <bjorncs@oath.com> | 2017-10-19 11:00:21 +0200 |
commit | e742b308d7559f09ac5927b44f695e14bc224a39 (patch) | |
tree | 2fee61425a42efec0e0adfbeb485a59e03e9fe19 /travis | |
parent | 61895cb06a51863d4bb337925ff0f89e328f261a (diff) |
Do full build for both master branch and PRs
Diffstat (limited to 'travis')
-rw-r--r-- | travis/cpp-prelude.sh | 7 | ||||
-rw-r--r-- | travis/prelude.sh | 7 | ||||
-rwxr-xr-x | travis/travis-build-cpp.sh | 20 | ||||
-rwxr-xr-x | travis/travis-build-full.sh | 9 | ||||
-rwxr-xr-x | travis/travis-build-java.sh | 10 | ||||
-rwxr-xr-x | travis/travis.sh | 3 |
6 files changed, 8 insertions, 48 deletions
diff --git a/travis/cpp-prelude.sh b/travis/cpp-prelude.sh deleted file mode 100644 index 67b6dc3499b..00000000000 --- a/travis/cpp-prelude.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -set -e - -ccache --max-size=1250M -ccache --set-config=compression=true -ccache --print-config diff --git a/travis/prelude.sh b/travis/prelude.sh deleted file mode 100644 index c3467bff05f..00000000000 --- a/travis/prelude.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -set -e - -export SOURCE_DIR=/source -export NUM_THREADS=4 -source /etc/profile.d/devtoolset-6.sh || true diff --git a/travis/travis-build-cpp.sh b/travis/travis-build-cpp.sh deleted file mode 100755 index 07b3c90e718..00000000000 --- a/travis/travis-build-cpp.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -set -e - -source /source/travis/prelude.sh -source ${SOURCE_DIR}/travis/cpp-prelude.sh - -BUILD_DIR=~/build -mkdir "${BUILD_DIR}" - -cd ${SOURCE_DIR} -./bootstrap.sh java -mvn install --no-snapshot-updates --batch-mode --threads ${NUM_THREADS} \ - -Dmaven.test.skip=true -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -cd ${BUILD_DIR} -bash ${SOURCE_DIR}/bootstrap-cmake.sh ${SOURCE_DIR} -make -j ${NUM_THREADS} -make install -ctest3 --output-on-failure -j ${NUM_THREADS} -ccache --show-stats diff --git a/travis/travis-build-full.sh b/travis/travis-build-full.sh index 7ee9a1c065f..077a411f7f4 100755 --- a/travis/travis-build-full.sh +++ b/travis/travis-build-full.sh @@ -2,8 +2,13 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. set -e -source /source/travis/prelude.sh -source ${SOURCE_DIR}/travis/cpp-prelude.sh +export SOURCE_DIR=/source +export NUM_THREADS=4 +source /etc/profile.d/devtoolset-6.sh || true + +ccache --max-size=1250M +ccache --set-config=compression=true +ccache --print-config cd ${SOURCE_DIR} sh ./bootstrap.sh java diff --git a/travis/travis-build-java.sh b/travis/travis-build-java.sh deleted file mode 100755 index 37a61d19f69..00000000000 --- a/travis/travis-build-java.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -set -e - -source /source/travis/prelude.sh - -cd "${SOURCE_DIR}" -export MAVEN_OPTS="-Xms128m -Xmx1g" -sh ./bootstrap.sh java -mvn install --no-snapshot-updates --batch-mode --threads ${NUM_THREADS} diff --git a/travis/travis.sh b/travis/travis.sh index 469e5891e58..5b246b64fb9 100755 --- a/travis/travis.sh +++ b/travis/travis.sh @@ -10,11 +10,10 @@ function bell() { done } -PLATFORM_LANGUAGE=$1 DOCKER_IMAGE=vespaengine/vespa-dev:latest bell & docker run --rm -v ${HOME}/.m2:/root/.m2 -v ${HOME}/.ccache:/root/.ccache -v $(pwd):/source \ - --entrypoint /source/travis/travis-build-${PLATFORM_LANGUAGE}.sh ${DOCKER_IMAGE} + --entrypoint /source/travis/travis-build-full.sh ${DOCKER_IMAGE} exit $? |