From 63b605dabe3255c4252bdd4d85e16713e35435da Mon Sep 17 00:00:00 2001 From: Taylor Smock Date: Sat, 28 Sep 2019 12:23:49 -0600 Subject: [PATCH] Remove java 10 builds (java 10 no longer supported) and ignore failures with java11+ due to CPD Signed-off-by: Taylor Smock --- .gitlab-ci.yml | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 957d5cd..327532c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -31,15 +31,6 @@ assemble: paths: - build/ -assemble with java 10: - stage: build - image: registry.gitlab.com/josm/docker-library/openjdk-10-josmplugin:latest - script: - - ./gradlew assemble --stacktrace - artifacts: - paths: - - build/ - assemble with java 11: stage: build image: registry.gitlab.com/josm/docker-library/openjdk-11-josmplugin:latest @@ -69,7 +60,6 @@ assemble with java 13: - build/ allow_failure: true - ############## # Test stage # ############## @@ -98,14 +88,6 @@ compile against latest JOSM: dependencies: - assemble -build with java 10: - stage: test - image: registry.gitlab.com/josm/docker-library/openjdk-10-josmplugin:latest - script: - - ./gradlew build --stacktrace - dependencies: - - assemble with java 10 - build with java 11: stage: test image: registry.gitlab.com/josm/docker-library/openjdk-11-josmplugin:latest @@ -113,6 +95,7 @@ build with java 11: - ./gradlew build --stacktrace dependencies: - assemble with java 11 + allow_failure: true # due to copy-paste-detection build with java 12: stage: test @@ -132,7 +115,7 @@ build with java 13: - assemble with java 13 allow_failure: true -java: +junit tests: stage: test script: - ./gradlew test