From d79785b9ed557ca33c084040e07f57f036eb1155 Mon Sep 17 00:00:00 2001
From: rschoene <rene.schoene@tu-dresden.de>
Date: Wed, 28 Jul 2021 17:54:57 +0200
Subject: [PATCH] cleanup build and allow publish also on dev.
---
.gitlab-ci.yml | 4 ++++
ragconnect.base/build.gradle | 12 ++++++------
2 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 56c0e1b..70f955c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -52,6 +52,7 @@ publish:
script:
- "./gradlew publish"
only:
+ - dev
- master
ragdoc_build:
@@ -81,6 +82,9 @@ ragdoc_view:
- OUTPUT_DIR=$(pwd -P)/pages/docs/ragdoc
- cd /ragdoc-view/src/ && rm -rf data && ln -s $DATA_DIR
- /ragdoc-view/build-view.sh --output-path=$OUTPUT_DIR
+ only:
+ - dev
+ - master
artifacts:
paths:
- "pages/docs/ragdoc"
diff --git a/ragconnect.base/build.gradle b/ragconnect.base/build.gradle
index 77bafe5..671556c 100644
--- a/ragconnect.base/build.gradle
+++ b/ragconnect.base/build.gradle
@@ -34,11 +34,11 @@ dependencies {
}
def versionFile = 'src/main/resources/ragConnectVersion.properties'
-def oldProps = new Properties()
+def props = new Properties()
try {
- file(versionFile).withInputStream { stream -> oldProps.load(stream) }
- version = oldProps['version']
+ file(versionFile).withInputStream { stream -> props.load(stream) }
+ version = props['version']
} catch (e) {
// this happens, if either the properties file is not present, or cannot be read from
throw new GradleException("File ${versionFile} not found or unreadable. Aborting.", e)
@@ -52,9 +52,9 @@ task printVersion() {
task newVersion() {
doFirst {
- def props = new Properties()
- props['version'] = value
- props.store(file(versionFile).newWriter(), null)
+ def newProps = new Properties()
+ newProps['version'] = value
+ newProps.store(file(versionFile).newWriter(), null)
}
}
--
GitLab