From bc4938087a9538c96134ecdff560f987aac22981 Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@pmd-code.org>
Date: Sat, 14 Nov 2020 20:29:27 +0100
Subject: [PATCH] [ci] Only install java7 on Linux, add GITHUB_TOKEN for sonar

---
 .ci/build-pr-win-macos.sh    | 13 ++++++++++---
 .github/workflows/pushes.yml |  1 +
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/.ci/build-pr-win-macos.sh b/.ci/build-pr-win-macos.sh
index 1fdd821c97..a6dca3172b 100755
--- a/.ci/build-pr-win-macos.sh
+++ b/.ci/build-pr-win-macos.sh
@@ -7,9 +7,16 @@ source $(dirname $0)/inc/maven-dependencies.inc
 
 set -e
 
-log_group_start "Installing Java 7+11"
+log_group_start "Installing Java"
+    log_info "Install openjdk11 as default"
     install_openjdk_setdefault 11
-    install_oraclejdk7
+
+    PMD_EXTRA_OPT=""
+    if [[ "$(uname)" == Linux* ]]; then
+        log_info "Install oracle7 for integration tests"
+        install_oraclejdk7
+        PMD_EXTRA_OPT="-Djava7.home=${HOME}/oraclejdk7"
+    fi
 log_group_end
 
 log_group_start "Downloading maven dependencies"
@@ -17,7 +24,7 @@ log_group_start "Downloading maven dependencies"
 log_group_end
 
 log_group_start "Building with maven"
-    ./mvnw -e -V clean verify -Djava7.home=${HOME}/oraclejdk7
+    ./mvnw -e -V clean verify ${PMD_EXTRA_OPT}
 log_group_end
 
 
diff --git a/.github/workflows/pushes.yml b/.github/workflows/pushes.yml
index 695f8070fd..a47ef7d51a 100644
--- a/.github/workflows/pushes.yml
+++ b/.github/workflows/pushes.yml
@@ -115,3 +115,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 }}