Save one of the last spots in our Shell + Git + GitLab introdoctury course on Friday and Monday next week. 👉 Register here.

Commit 9f056381 authored by Thomas Beermann's avatar Thomas Beermann
Browse files

Fix pipeline

parent e0f8695b
Pipeline #85395 passed with stages
in 3 minutes and 44 seconds
......@@ -9,7 +9,7 @@ variables:
MAVEN_CLI_OPTS: "-s .m2/ci_settings.xml --batch-mode"
MAVEN_OPTS: "-Dmaven.repo.local=.m2/repository"
WEBAPP_PROJECT_VERSION: "0.0.2-SNAPSHOT"
WEBAPP_BRANCH: ""
WEBAPP_PROJECT_BRANCH: ""
cache:
key: "$CI_COMMIT_REF_NAME"
......
......@@ -37,11 +37,16 @@ deploy:
script:
- |
if [[ -n $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME ]]; then
WEBAPP_BRANCH=".$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME"
WEBAPP_PROJECT_BRANCH=".$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME"
echo "WEBAPP_PROJECT_BRANCH=$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME" >> build.env
elif [[ -n "$CI_COMMIT_TAG" ]]; then
WEBAPP_PROJECT_VERSION=$CI_COMMIT_TAG
fi
echo "WEBAPP_PROJECT_VERSION=$WEBAPP_PROJECT_VERSION" >> build.env
- mvn $MAVEN_CLI_OPTS deploy
artifacts:
reports:
dotenv: build.env
trigger:
only:
......@@ -50,6 +55,6 @@ trigger:
- tags
variables:
WEBAPP_VERSION: $WEBAPP_PROJECT_VERSION
WEBAPP_BRANCH: $WEBAPP_BRANCH
WEBAPP_BRANCH: $WEBAPP_PROJECT_BRANCH
stage: trigger_marketplace_server
trigger: hifis-technical-platform/helmholtz-marketplace-server
......@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>de.helmholtz.marketplace</groupId>
<artifactId>helmholtz-marketplace-webapp${env.WEBAPP_BRANCH}</artifactId>
<artifactId>helmholtz-marketplace-webapp${env.WEBAPP_PROJECT_BRANCH}</artifactId>
<version>${env.WEBAPP_PROJECT_VERSION}</version>
<packaging>pom</packaging>
<inceptionYear>2020</inceptionYear>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment