diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f212e144a859a527b8add94d68d5ce474adfe9cd..66ee503304a0e0ff692fb4c1f27933e0ccb93945 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,20 +12,35 @@ build: before_script: - ls -lah * script: - - ./gradlew assemble + - "./gradlew assemble" test: image: openjdk:11 stage: test + needs: + - build script: - - ./gradlew test + - "./gradlew test" artifacts: reports: - junit: relast2uml.tests/build/test-results/test/TEST-*.xml + junit: "*/build/test-results/test/TEST-*.xml" -publish: +publish_dev: image: openjdk:11 stage: publish + needs: + - test + script: + - "./gradlew setDevVersionForCI" + - "./gradlew publish" + only: + - dev + +publish_master: + image: openjdk:11 + stage: publish + needs: + - test script: - "./gradlew publish" only: @@ -34,11 +49,13 @@ publish: pages: image: python:3.7-alpine stage: publish + needs: + - test script: - - pip install -U sphinx sphinx-rtd-theme recommonmark sphinxemoji sphinx-markdown-tables - - sphinx-build -b html pages/ public + - "pip install -U sphinx sphinx-rtd-theme recommonmark sphinxemoji sphinx-markdown-tables" + - "sphinx-build -b html pages/ public" artifacts: paths: - public only: - - master + - master diff --git a/buildSrc/src/main/groovy/relast2uml.java-publishing-conventions.gradle b/buildSrc/src/main/groovy/relast2uml.java-publishing-conventions.gradle index 0a5d763501b81b682a8a37c30e0282ff5f378b2d..e3130c9008342d8dc2be8d80e2b29ba064cb31fa 100644 --- a/buildSrc/src/main/groovy/relast2uml.java-publishing-conventions.gradle +++ b/buildSrc/src/main/groovy/relast2uml.java-publishing-conventions.gradle @@ -46,6 +46,14 @@ task newVersion() { } } +task setDevVersionForCI() { + doFirst { + def props = new Properties() + props['version'] = version + "-$System.env.CI_PIPELINE_IID" + props.store(file(versionFile).newWriter(), null) + } +} + //679 publishing { publications {