Merge branch 'master' into pmd/7.0.x

This commit is contained in:
Andreas Dangel
2020-11-14 20:34:49 +01:00
2 changed files with 10 additions and 4 deletions

View File

@ -7,11 +7,16 @@ source $(dirname $0)/inc/maven-dependencies.inc
set -e
log_group_start "Installing Java 8+11"
log_group_start "Installing Java"
log_info "Install openjdk11 as default"
install_openjdk_setdefault 11
log_info "Install openjdk8 for integration tests and pmd-regression-tests"
install_openjdk 8
PMD_EXTRA_OPT=""
if [[ "$(uname)" == Linux* ]]; then
log_info "Install openjdk8 for integration tests and pmd-regression-tests"
install_openjdk 8
PMD_EXTRA_OPT="-Djava8.home=${HOME}/openjdk8"
fi
log_group_end
log_group_start "Downloading maven dependencies"
@ -19,7 +24,7 @@ log_group_start "Downloading maven dependencies"
log_group_end
log_group_start "Building with maven"
./mvnw -e -V clean verify -Djava8.home=${HOME}/openjdk8
./mvnw -e -V clean verify ${PMD_EXTRA_OPT}
log_group_end

View File

@ -116,3 +116,4 @@ jobs:
env:
MAVEN_OPTS: -Dmaven.wagon.httpconnectionManager.ttlSeconds=180 -Dmaven.wagon.http.retryHandler.count=3
PMD_CI_SECRET_PASSPHRASE: ${{ secrets.PMD_CI_SECRET_PASSPHRASE }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}