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 14:16:15 UTC

[isis] branch master updated: updates gitlab ci, build core and example app separately

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 195469c  updates gitlab ci, build core and example app separately
195469c is described below

commit 195469caf7d0b27c9a20f3196ae2d4c610718af6
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Thu Mar 15 13:43:43 2018 +0000

    updates gitlab ci, build core and example app separately
---
 .gitlab-ci.yml | 41 ++++++++++++++++++++++++++++++++++-------
 1 file changed, 34 insertions(+), 7 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 93c5ad9..6fdde80 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,11 +1,38 @@
+image: maven:3.5.3-jdk-8
+
+before_script:
+  - export BASELINE=2.0.0-M1
+  - export REVISION=$BASELINE.$(date +%Y%m%d)-$(git rev-parse --short HEAD)
+
+services:
+  - docker:dind
+
+variables:
+  DOCKER_HOST: tcp://docker:2375
+  DOCKER_DRIVER: overlay2
+  MAVEN_CLI_OPTS: "--batch-mode"
+
 stages:
-  - build
+  - build-package
 
-maven-build:
-  image: maven:3-jdk-8
-  stage: build
+build-package:
+  stage: build-package
   script:
-    - mvn -Drevision=2.0.0-M1.$(date +%Y%m%d)-$(git rev-parse --short HEAD) -Dskip.arch -Dskip.app -B clean install
-    - cd example/application/simpleapp
-    - mvn -Drevision=2.0.0-M1.$(date +%Y%m%d)-$(git rev-parse --short HEAD) -Dmavenmixin-docker -Ddocker-plugin.imageName=isis/simpleapp -B install
+    - echo "REVISION=$REVISION"
+    - >
+      cd core && \
+      mvn $MAVEN_CLI_OPTS \
+          clean install \
+          -Drevision=$REVISION && \
+      cd ..
+    - >
+      cd example/application/simpleapp && \
+      mvn $MAVEN_CLI_OPTS \
+          install \
+          -Drevision=$REVISION \
+          -Disis.version=$REVISION \
+          -Dmavenmixin-docker \
+          -Ddocker-plugin.imageName=isis/simpleapp && \
+      cd ../../..
+
 

-- 
To stop receiving notification emails like this one, please contact
danhaywood@apache.org.