Skip to content

Commit ff7b4ff

Browse files
committed
Set JAVA_HOME in each stage
1 parent 506d0ba commit ff7b4ff

File tree

1 file changed

+9
-3
lines changed

1 file changed

+9
-3
lines changed

vars/buildUnityWdkV3.groovy

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ def call(Map configMap = [unityVersions: []]) {
4343
UVM_AUTO_INSTALL_UNITY_EDITOR = "YES"
4444
LOG_LEVEL = "${config.gradleArgs.logLevel}"
4545
ATLAS_READ = credentials('artifactory_read') //needed for gradle sto read private packages
46-
JAVA_HOME = "$JAVA_11_HOME"
4746
}
4847

4948
parameters {
@@ -66,6 +65,7 @@ def call(Map configMap = [unityVersions: []]) {
6665
}
6766
environment {
6867
UNITY_PACKAGE_MANAGER = 'paket'
68+
JAVA_HOME = "${JAVA_11_HOME}"
6969
}
7070
steps {
7171
script {
@@ -99,6 +99,7 @@ def call(Map configMap = [unityVersions: []]) {
9999
environment {
100100
UPM_USER_CONFIG_FILE = credentials('atlas-upm-credentials')
101101
UNITY_PACKAGE_MANAGER = 'upm'
102+
JAVA_HOME = "${JAVA_11_HOME}"
102103
}
103104
steps {
104105
script {
@@ -133,6 +134,9 @@ def call(Map configMap = [unityVersions: []]) {
133134
agent {
134135
label "atlas && macos"
135136
}
137+
environment {
138+
JAVA_HOME = "${JAVA_11_HOME}"
139+
}
136140
steps {
137141
unstash 'upm_setup_w'
138142
unstash 'paket_setup_w'
@@ -165,6 +169,7 @@ def call(Map configMap = [unityVersions: []]) {
165169
environment {
166170
UNITY_PACKAGE_MANAGER = 'upm'
167171
UPM_USER_CONFIG_FILE = credentials('atlas-upm-credentials')
172+
JAVA_HOME = "${JAVA_11_HOME}"
168173
}
169174
steps {
170175
unstash 'upm_setup_w'
@@ -203,12 +208,12 @@ def call(Map configMap = [unityVersions: []]) {
203208
steps {
204209
script {
205210
parallel paket: {
206-
withEnv(["UNITY_PACKAGE_MANAGER=paket"]) {
211+
withEnv(["UNITY_PACKAGE_MANAGER=paket", "JAVA_HOME=${JAVA_11_HOME}"]) {
207212
parallel checkSteps(config, "paket check unity ", "paket_setup_w")
208213
}
209214
},
210215
upm: {
211-
withEnv(["UNITY_PACKAGE_MANAGER=upm"]) {
216+
withEnv(["UNITY_PACKAGE_MANAGER=upm", "JAVA_HOME=${JAVA_11_HOME}"]) {
212217
parallel checkSteps(config, "upm check unity ", "upm_setup_w")
213218
}
214219
},
@@ -231,6 +236,7 @@ def call(Map configMap = [unityVersions: []]) {
231236
GRGIT_PASS = "${GRGIT_PSW}"
232237
GITHUB_LOGIN = "${GRGIT_USR}"
233238
GITHUB_PASSWORD = "${GRGIT_PSW}"
239+
JAVA_HOME = "${JAVA_11_HOME}"
234240
}
235241

236242
steps {

0 commit comments

Comments
 (0)