Update build scripts (start building on Java 14)

Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
pull/1/head
Taylor Smock 2019-11-15 08:21:31 -07:00
rodzic a82443e1bb
commit 362033c16f
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 625F6A74A3E4311A
2 zmienionych plików z 32 dodań i 11 usunięć

Wyświetl plik

@ -31,7 +31,7 @@ cache:
assemble: assemble:
stage: build stage: build
script: script:
- ./gradlew assemble --stacktrace - ./gradlew assemble
artifacts: artifacts:
paths: paths:
- build/ - build/
@ -40,7 +40,7 @@ assemble with java 11:
stage: build stage: build
image: registry.gitlab.com/josm/docker-library/openjdk-11-josmplugin:latest image: registry.gitlab.com/josm/docker-library/openjdk-11-josmplugin:latest
script: script:
- ./gradlew assemble --stacktrace - ./gradlew assemble
artifacts: artifacts:
paths: paths:
- build/ - build/
@ -49,7 +49,7 @@ assemble with java 12:
stage: build stage: build
image: registry.gitlab.com/josm/docker-library/openjdk-12-josmplugin:latest image: registry.gitlab.com/josm/docker-library/openjdk-12-josmplugin:latest
script: script:
- ./gradlew assemble --stacktrace - ./gradlew assemble
artifacts: artifacts:
paths: paths:
- build/ - build/
@ -59,12 +59,23 @@ assemble with java 13:
stage: build stage: build
image: registry.gitlab.com/josm/docker-library/openjdk-13-josmplugin:latest image: registry.gitlab.com/josm/docker-library/openjdk-13-josmplugin:latest
script: script:
- ./gradlew assemble --stacktrace - ./gradlew assemble
artifacts: artifacts:
paths: paths:
- build/ - build/
allow_failure: true 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 # # Test stage #
############## ##############
@ -72,7 +83,7 @@ assemble with java 13:
build: build:
stage: test stage: test
script: script:
- ./gradlew build generatePot generateSnapshotUpdateSite --info - ./gradlew build generatePot generateSnapshotUpdateSite #--info
artifacts: artifacts:
paths: paths:
- build - build
@ -82,8 +93,9 @@ build:
test: test:
stage: test stage: test
script: script:
- ./gradlew check --stacktrace --continue --info - ./gradlew check --stacktrace --continue #--info
- ./gradlew jacocoTestReport - ./gradlew jacocoTestReport
- ./gradlew jacocoTestCoverageVerification
artifacts: artifacts:
paths: paths:
- build - build
@ -112,7 +124,7 @@ build with java 11:
stage: test stage: test
image: registry.gitlab.com/josm/docker-library/openjdk-11-josmplugin:latest image: registry.gitlab.com/josm/docker-library/openjdk-11-josmplugin:latest
script: script:
- ./gradlew build --stacktrace - ./gradlew build
dependencies: dependencies:
- assemble with java 11 - assemble with java 11
allow_failure: true # due to copy-paste-detection allow_failure: true # due to copy-paste-detection
@ -121,7 +133,7 @@ build with java 12:
stage: test stage: test
image: registry.gitlab.com/josm/docker-library/openjdk-12-josmplugin:latest image: registry.gitlab.com/josm/docker-library/openjdk-12-josmplugin:latest
script: script:
- ./gradlew build --stacktrace - ./gradlew build
dependencies: dependencies:
- assemble with java 12 - assemble with java 12
allow_failure: true allow_failure: true
@ -130,11 +142,20 @@ build with java 13:
stage: test stage: test
image: registry.gitlab.com/josm/docker-library/openjdk-13-josmplugin:latest image: registry.gitlab.com/josm/docker-library/openjdk-13-josmplugin:latest
script: script:
- ./gradlew build --stacktrace - ./gradlew build
dependencies: dependencies:
- assemble with java 13 - assemble with java 13
allow_failure: true 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 # # Deploy stage #
################ ################

Wyświetl plik

@ -13,7 +13,7 @@ plugins {
id "pmd" id "pmd"
id "com.github.ben-manes.versions" version "0.27.0" id "com.github.ben-manes.versions" version "0.27.0"
id "com.github.spotbugs" version "2.0.1" 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 "net.ltgt.errorprone" version "1.1.1"
//id 'de.aaschmid.cpd' version '2.0' //id 'de.aaschmid.cpd' version '2.0'
} }
@ -91,7 +91,7 @@ test {
useJUnitPlatform() useJUnitPlatform()
testLogging { testLogging {
exceptionFormat "full" exceptionFormat "full"
events "passed", "skipped", "failed" events "skipped", "failed"
info { info {
showStandardStreams true showStandardStreams true
} }