diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a87a7c5..a730b83 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -31,7 +31,7 @@ cache: assemble: stage: build script: - - ./gradlew assemble --stacktrace + - ./gradlew assemble artifacts: paths: - build/ @@ -40,7 +40,7 @@ assemble with java 11: stage: build image: registry.gitlab.com/josm/docker-library/openjdk-11-josmplugin:latest script: - - ./gradlew assemble --stacktrace + - ./gradlew assemble artifacts: paths: - build/ @@ -49,7 +49,7 @@ assemble with java 12: stage: build image: registry.gitlab.com/josm/docker-library/openjdk-12-josmplugin:latest script: - - ./gradlew assemble --stacktrace + - ./gradlew assemble artifacts: paths: - build/ @@ -59,12 +59,23 @@ assemble with java 13: stage: build image: registry.gitlab.com/josm/docker-library/openjdk-13-josmplugin:latest script: - - ./gradlew assemble --stacktrace + - ./gradlew assemble artifacts: paths: - build/ allow_failure: true +assemble with java 14: + stage: build + image: registry.gitlab.com/josm/docker-library/openjdk-14-josmplugin:latest + script: + - ./gradlew assemble + artifacts: + paths: + - build/ + allow_failure: true + + ############## # Test stage # ############## @@ -72,7 +83,7 @@ assemble with java 13: build: stage: test script: - - ./gradlew build generatePot generateSnapshotUpdateSite --info + - ./gradlew build generatePot generateSnapshotUpdateSite #--info artifacts: paths: - build @@ -82,8 +93,9 @@ build: test: stage: test script: - - ./gradlew check --stacktrace --continue --info + - ./gradlew check --stacktrace --continue #--info - ./gradlew jacocoTestReport + - ./gradlew jacocoTestCoverageVerification artifacts: paths: - build @@ -112,7 +124,7 @@ build with java 11: stage: test image: registry.gitlab.com/josm/docker-library/openjdk-11-josmplugin:latest script: - - ./gradlew build --stacktrace + - ./gradlew build dependencies: - assemble with java 11 allow_failure: true # due to copy-paste-detection @@ -121,7 +133,7 @@ build with java 12: stage: test image: registry.gitlab.com/josm/docker-library/openjdk-12-josmplugin:latest script: - - ./gradlew build --stacktrace + - ./gradlew build dependencies: - assemble with java 12 allow_failure: true @@ -130,11 +142,20 @@ build with java 13: stage: test image: registry.gitlab.com/josm/docker-library/openjdk-13-josmplugin:latest script: - - ./gradlew build --stacktrace + - ./gradlew build dependencies: - assemble with java 13 allow_failure: true +build with java 14: + stage: test + image: registry.gitlab.com/josm/docker-library/openjdk-14-josmplugin:latest + script: + - ./gradlew build + dependencies: + - assemble with java 14 + allow_failure: true + ################ # Deploy stage # ################ diff --git a/build.gradle b/build.gradle index 32753c2..a99e9ca 100644 --- a/build.gradle +++ b/build.gradle @@ -13,7 +13,7 @@ plugins { id "pmd" id "com.github.ben-manes.versions" version "0.27.0" id "com.github.spotbugs" version "2.0.1" - id "org.openstreetmap.josm" version "0.6.4" + id "org.openstreetmap.josm" version "0.6.5" id "net.ltgt.errorprone" version "1.1.1" //id 'de.aaschmid.cpd' version '2.0' } @@ -91,7 +91,7 @@ test { useJUnitPlatform() testLogging { exceptionFormat "full" - events "passed", "skipped", "failed" + events "skipped", "failed" info { showStandardStreams true }