diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 56c0e1b7d49ac9c19ac72b6e1bbc0d7be7b1191c..70f955c066941e1f22918595675270a4c5570ae2 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 77bafe579a620ca243e1061785fcf1ddef8a3108..671556c463b40a4224cc70df5ad1db0340858ee5 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) } }