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 2019/02/07 19:31:09 UTC
[isis] branch master updated: ISIS-2072: updates gitlab ci to also
publish to GCP.
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 3529e0c ISIS-2072: updates gitlab ci to also publish to GCP.
3529e0c is described below
commit 3529e0c1c6b60289be43ecbd887e18d4c4629fc0
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Thu Feb 7 19:30:52 2019 +0000
ISIS-2072: updates gitlab ci to also publish to GCP.
---
.gitlab-ci.yml | 16 +++++++++++++++-
.travis.yml | 6 ------
core/.m2/settings.xml | 5 +++++
3 files changed, 20 insertions(+), 7 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9d851ba..ea07bde 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,6 +4,11 @@
# - NEXUS_USERNAME
# - NEXUS_PASSWORD
# - NEXUS_REPO_URL
+#
+# - GCPAPPENGINEREPO_USERNAME
+# - GCPAPPENGINEREPO_PASSWORD
+# - GCPAPPENGINEREPO_REPO_URL
+#
# - DOCKER_REGISTRY_USERNAME
# - DOCKER_REGISTRY_PASSWORD
# - DOCKER_REGISTRY_EMAIL
@@ -16,7 +21,7 @@
image: maven:3.5.3-jdk-8
before_script:
- - export BASELINE=1.16.2
+ - export BASELINE=1.17.0
- export REVISION=$BASELINE.$(date +%Y%m%d)-$(date +%H%M)-$(echo $CI_COMMIT_SHA | cut -c1-8)
services:
@@ -37,6 +42,7 @@ build-package-push:
- echo ""
- echo ""
- echo "$REVISION"
+ - echo "GCPAPPENGINEREPO_URL=$GCPAPPENGINEREPO_URL"
- echo ""
- echo ""
- echo ""
@@ -45,6 +51,14 @@ build-package-push:
mvn -s .m2/settings.xml \
--batch-mode \
clean deploy \
+ -Dgcpappenginerepo-deploy \
+ -Dgcpappenginerepo-deploy.repositoryUrl=$GCPAPPENGINEREPO_URL \
+ -Drevision=$REVISION \
+ $CORE_ADDITIONAL_OPTS
+ - >
+ mvn -s .m2/settings.xml \
+ --batch-mode \
+ clean deploy \
-Drevision=$REVISION \
-Dnexus-deploy \
-Dnexus-deploy.repositoryUrl=$NEXUS_REPO_URL \
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index ae5c5a7..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-language: java
-jdk:
- - oraclejdk8
-install:
- -
-script: "mvn clean install -Dskip.app -Dskip.arch"
diff --git a/core/.m2/settings.xml b/core/.m2/settings.xml
index d8f8562..fb863cf 100644
--- a/core/.m2/settings.xml
+++ b/core/.m2/settings.xml
@@ -26,5 +26,10 @@
<username>${env.NEXUS_USERNAME}</username>
<password>${env.NEXUS_PASSWORD}</password>
</server>
+ <server>
+ <id>gcpappenginerepo-deploy.serverId</id>
+ <username>${env.GCPAPPENGINEREPO_USERNAME}</username>
+ <password>${env.GCPAPPENGINEREPO_PASSWORD}</password>
+ </server>
</servers>
</settings>