This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit d0e6c12c47041382f242b21e6424ba637ce853ac
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Thu Mar 15 17:35:41 2018 +0000
Revert "ISIS-1904: further tweaks for gitlab ci"
This reverts commit 92725aeafafe6c9acb539d137dcd8313f0946b26.
---
.gitlab-ci.yml | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4b2d569..4268c70 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -19,6 +19,7 @@ services:
variables:
DOCKER_HOST: tcp://docker:2375
DOCKER_DRIVER: overlay2
+ MAVEN_CLI_OPTS: "-s .m2/settings.xml --batch-mode"
MAVEN_OPTS: "-Dmaven.repo.local=.m2/repository -Dskip.cloudbees-estatio-repositories -Dskip.sonatype-snapshots -Dskip.apache-snapshots"
DOCKER_REGISTRY_ID: "docker-hub"
DOCKER_REGISTRY_URL: "https://index.docker.io/v1/"
@@ -33,22 +34,20 @@ build-package:
- echo "REVISION=$REVISION"
- cd core
- >
- mvn --batch-mode \
+ mvn $MAVEN_CLI_OPTS \
clean install \
-Drevision=$REVISION
- cd ..
- cd example/application/simpleapp
- >
- mvn -s .m2/settings.xml \
- --batch-mode \
+ mvn $MAVEN_CLI_OPTS \
install \
-Drevision=$REVISION \
-Disis.version=$REVISION \
-Dmavenmixin-docker \
-Ddocker-plugin.imageName=$DOCKER_REGISTRY_USERNAME/$DOCKER_REGISTRY_REPOSITORY
- >
- mvn -s .m2/settings.xml \
- --batch-mode \
+ mvn $MAVEN_CLI_OPTS \
docker:push@push-image-tagged \
-pl webapp \
-Drevision=$REVISION \
--
To stop receiving notification emails like this one, please contact
danhaywood@apache.org.