You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2018/03/15 16:23:53 UTC
[isis] branch master updated: ISIS-1904: further tweaks for gitlab
ci
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
The following commit(s) were added to refs/heads/master by this push:
new 92725ae ISIS-1904: further tweaks for gitlab ci
92725ae is described below
commit 92725aeafafe6c9acb539d137dcd8313f0946b26
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Thu Mar 15 16:23:45 2018 +0000
ISIS-1904: further tweaks for gitlab ci
don't pass custom settings.xml when building core
---
.gitlab-ci.yml | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3c5028a..e05de83 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -19,7 +19,6 @@ 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/"
@@ -34,20 +33,22 @@ build-package:
- echo "REVISION=$REVISION"
- cd core
- >
- mvn $MAVEN_CLI_OPTS \
+ mvn --batch-mode \
clean install \
-Drevision=$REVISION
- cd ..
- cd example/application/simpleapp
- >
- mvn $MAVEN_CLI_OPTS \
+ mvn -s .m2/settings.xml \
+ --batch-mode \
install \
-Drevision=$REVISION \
-Disis.version=$REVISION \
-Dmavenmixin-docker \
-Ddocker-plugin.imageName=$DOCKER_REGISTRY_USERNAME/$DOCKER_REGISTRY_REPOSITORY
- >
- mvn $MAVEN_CLI_OPTS \
+ mvn -s .m2/settings.xml \
+ --batch-mode \
docker:push@push-image-tagged \
-pl webapp \
-Drevision=$REVISION \
--
To stop receiving notification emails like this one, please contact
danhaywood@apache.org.