diff options
| author | gjoranv <gjoranv@gmail.com> | 2017-06-19 15:04:56 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-19 15:04:56 +0200 |
| commit | d0359e50b04d8c9bb0905c5d46ad8f8016d7a36f (patch) | |
| tree | e87c4c3fe372e5fe1f3cf5ce41934be57f36002e /docker | |
| parent | c72652c9ef9a98deb652c6cf3ceeee284134c7e0 (diff) | |
| parent | af1e1b1a6891aa87b5725f43c0a7215e4dba5e3a (diff) | |
Merge pull request #2824 from yahoo/bjorncs/docker-ci
Bjorncs/docker ci
Diffstat (limited to 'docker')
| -rwxr-xr-x | docker/vespa-ci-internal.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docker/vespa-ci-internal.sh b/docker/vespa-ci-internal.sh index cd3690e3186..c1de874d5ca 100755 --- a/docker/vespa-ci-internal.sh +++ b/docker/vespa-ci-internal.sh @@ -19,10 +19,10 @@ mkdir "${SOURCE_DIR}" mkdir "${BUILD_DIR}" git clone --no-checkout --local --no-hardlinks file:///vespa "${SOURCE_DIR}" cd "${SOURCE_DIR}" -git checkout --detach ${GIT_COMMIT} +git -c advice.detachedHead=false checkout --detach ${GIT_COMMIT} source /opt/rh/devtoolset-6/enable || true sh ./bootstrap.sh full -MAVEN_OPTS="-Xms512m -Xmx512m" mvn install +MAVEN_OPTS="-Xms128m -Xmx512m" mvn install cd "${BUILD_DIR}" cmake3 -DCMAKE_INSTALL_PREFIX=/opt/vespa \ -DJAVA_HOME=/usr/lib/jvm/java-openjdk \ |