diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6426b70665c0d496a3971e2625c789bc924b161b..e447526548a2d3e91c9af3ab79b8511914f53002 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -87,7 +87,7 @@ publish_package: needs: - test script: + - "./gradlew setDevVersionForCI" - "./gradlew publish" - artifacts: - paths: - - "build/libs/rago-0.1.0.jar" \ No newline at end of file + only: + - 8-create-maven-package \ No newline at end of file diff --git a/build.gradle b/build.gradle index 34559229d0177f4ec1a8db2596310529f7363510..0cda6c99be28abeebbae9270b65e247d164bf537 100644 --- a/build.gradle +++ b/build.gradle @@ -35,31 +35,6 @@ dependencies { testImplementation group: 'com.jayway.jsonpath', name: 'json-path', version: "${json_path_version}" } -def versionFile = 'src/main/resources/version.properties' -def oldProps = new Properties() - -try { - file(versionFile).withInputStream { stream -> oldProps.load(stream) } - version = oldProps['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) -} - -task printVersion() { - doLast { - println(version) - } -} - -task newVersion() { - doFirst { - def props = new Properties() - props['version'] = value - props.store(file(versionFile).newWriter(), null) - } -} - buildscript { repositories.mavenCentral() dependencies { @@ -185,15 +160,43 @@ jastadd { } } +def versionFile = 'src/main/resources/version.properties' +def oldProps = new Properties() + +try { + file(versionFile).withInputStream { stream -> oldProps.load(stream) } + version = oldProps['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) +} + +task printVersion() { + doLast { + println(version) + } +} + +task newVersion() { + doFirst { + def props = new Properties() + props['version'] = value + props.store(file(versionFile).newWriter(), null) + } +} + +task setDevVersionForCI() { + doFirst { + def props = new Properties() + props['version'] = version + "-$System.env.CI_PIPELINE_IID" + props.store(file(versionFile).newWriter(), null) + } +} publishing { publications { maven(MavenPublication) { - artifactId = 'test-rago' - // from components.java - artifact("build/libs/rago-${version}.jar") { - extension 'jar' - } + from components.java } } repositories {