From 707575726cd4909fe2da4d1eceddec9393a3e894 Mon Sep 17 00:00:00 2001 From: Olle Hallin Date: Wed, 18 Sep 2019 09:19:20 +0200 Subject: [PATCH] Jenkinsfile: now calls tools/real-clean-workspace.sh --- .gradlew | 4 ++-- Jenkinsfile | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gradlew b/.gradlew index fd161f62a..46894e01b 100755 --- a/.gradlew +++ b/.gradlew @@ -6,6 +6,6 @@ # It is used from Jenkinsfile. #--------------------------------------------------------------------------------------------------------------- -declare javaVersion=$(awk '/sdkmanJavaDefault*/ {print $3}' gradle.properties) +declare javaVersion=$(awk '/sdkmanJavaDefault*/ {print $3}' $(dirname $0)/gradle.properties) -env JAVA_HOME=$HOME/.sdkman/candidates/java/$javaVersion ./gradlew --console=plain $* +env JAVA_HOME=$HOME/.sdkman/candidates/java/$javaVersion $(dirname $0)/gradlew --console=plain $* diff --git a/Jenkinsfile b/Jenkinsfile index cd77113f9..8dd0e0cba 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -9,7 +9,7 @@ node { sh """ printenv | sort tools/install-compilers.sh - # tools/real-clean-workspace.sh + tools/real-clean-workspace.sh pwd ./.gradlew --version ./.gradlew --stop