From 09143d65979a790701b86502447207364cb9c695 Mon Sep 17 00:00:00 2001
From: erbel <johannes.erbel@cs.uni-goettingen.de>
Date: Fri, 24 Jan 2020 16:13:33 +0100
Subject: [PATCH] Adjust build ci to automatically use tag version for jar
deployment
---
.gitlab-ci.yml | 5 +++++
build.gradle | 2 +-
de.ugoe.cs.rwm.mocci.connector.dummy/build.gradle | 2 +-
de.ugoe.cs.rwm.mocci.connector/build.gradle | 2 +-
de.ugoe.cs.rwm.mocci.model.edit/build.gradle | 2 +-
de.ugoe.cs.rwm.mocci.model/build.gradle | 2 +-
6 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9ceb2a2..0d616da 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -15,6 +15,7 @@ before_script:
build:
stage: build
script:
+ - export VERSION=SNAPSHOT
- gradle assemble
- gradle updateSiteZip
artifacts:
@@ -27,6 +28,7 @@ build:
test:
stage: test
script:
+ - export VERSION=SNAPSHOT
- mv src/test/resources/martserver-plugins ~/martserver-plugins/
- gradle check
- gradle jacocoRootReport
@@ -39,6 +41,7 @@ test:
pages:
stage: pages
script:
+ - export VERSION=SNAPSHOT
- mkdir public
- mv config/html/* public
- mv de.ugoe.cs.rwm.mocci.model/build/libs/*.jar public
@@ -53,6 +56,8 @@ pages:
upload:
stage: deploy
script:
+ - export VERSION=${CI_COMMIT_TAG}
+ - echo $VERSION
- gradle upload
only:
- tags
diff --git a/build.gradle b/build.gradle
index 4cc356d..f092c02 100644
--- a/build.gradle
+++ b/build.gradle
@@ -212,7 +212,7 @@ uploadArchives {
repository(url: "https://nexus.informatik.uni-goettingen.de/content/repositories/rwm/") {
authentication(userName: System.getenv('NEXUSUSER'), password: System.getenv('NEXUSPASSWORD'))
}
- pom.version = "1.0.0"
+ pom.version = System.getenv('VERSION')
pom.artifactId = "mocci"
pom.groupId = "de.ugoe.cs.rwm"
}
diff --git a/de.ugoe.cs.rwm.mocci.connector.dummy/build.gradle b/de.ugoe.cs.rwm.mocci.connector.dummy/build.gradle
index ded1a0d..47a193b 100644
--- a/de.ugoe.cs.rwm.mocci.connector.dummy/build.gradle
+++ b/de.ugoe.cs.rwm.mocci.connector.dummy/build.gradle
@@ -44,7 +44,7 @@ uploadArchives {
repository(url: "https://nexus.informatik.uni-goettingen.de/content/repositories/rwm/") {
authentication(userName: System.getenv('NEXUSUSER'), password: System.getenv('NEXUSPASSWORD'))
}
- pom.version = "1.0.0"
+ pom.version = System.getenv('VERSION')
pom.artifactId = "connector"
pom.groupId = "de.ugoe.cs.rwm.mocci"
}
diff --git a/de.ugoe.cs.rwm.mocci.connector/build.gradle b/de.ugoe.cs.rwm.mocci.connector/build.gradle
index 6647d9b..18be058 100644
--- a/de.ugoe.cs.rwm.mocci.connector/build.gradle
+++ b/de.ugoe.cs.rwm.mocci.connector/build.gradle
@@ -39,7 +39,7 @@ uploadArchives {
repository(url: "https://nexus.informatik.uni-goettingen.de/content/repositories/rwm/") {
authentication(userName: System.getenv('NEXUSUSER'), password: System.getenv('NEXUSPASSWORD'))
}
- pom.version = "1.0.0"
+ pom.version = System.getenv('VERSION')
pom.artifactId = "connector"
pom.groupId = "de.ugoe.cs.rwm.mocci"
}
diff --git a/de.ugoe.cs.rwm.mocci.model.edit/build.gradle b/de.ugoe.cs.rwm.mocci.model.edit/build.gradle
index 4819b85..b094a47 100644
--- a/de.ugoe.cs.rwm.mocci.model.edit/build.gradle
+++ b/de.ugoe.cs.rwm.mocci.model.edit/build.gradle
@@ -43,7 +43,7 @@ uploadArchives {
repository(url: "https://nexus.informatik.uni-goettingen.de/content/repositories/rwm/") {
authentication(userName: System.getenv('NEXUSUSER'), password: System.getenv('NEXUSPASSWORD'))
}
- pom.version = "1.0.0"
+ pom.version = System.getenv('VERSION')
pom.artifactId = "edit"
pom.groupId = "de.ugoe.cs.rwm.mocci.model"
}
diff --git a/de.ugoe.cs.rwm.mocci.model/build.gradle b/de.ugoe.cs.rwm.mocci.model/build.gradle
index cd2857a..01e2871 100644
--- a/de.ugoe.cs.rwm.mocci.model/build.gradle
+++ b/de.ugoe.cs.rwm.mocci.model/build.gradle
@@ -73,7 +73,7 @@ uploadArchives {
repository(url: "https://nexus.informatik.uni-goettingen.de/content/repositories/rwm/") {
authentication(userName: System.getenv('NEXUSUSER'), password: System.getenv('NEXUSPASSWORD'))
}
- pom.version = "1.0.0"
+ pom.version = System.getenv('VERSION')
pom.artifactId = "model"
pom.groupId = "de.ugoe.cs.rwm.mocci"
}
--
GitLab