@@ -43,7 +43,6 @@ def call(Map configMap = [unityVersions: []]) {
43
43
UVM_AUTO_INSTALL_UNITY_EDITOR = " YES"
44
44
LOG_LEVEL = " ${ config.gradleArgs.logLevel} "
45
45
ATLAS_READ = credentials(' artifactory_read' ) // needed for gradle sto read private packages
46
- JAVA_HOME = " $JAVA_11_HOME "
47
46
}
48
47
49
48
parameters {
@@ -66,6 +65,7 @@ def call(Map configMap = [unityVersions: []]) {
66
65
}
67
66
environment {
68
67
UNITY_PACKAGE_MANAGER = ' paket'
68
+ JAVA_HOME = " ${ JAVA_11_HOME} "
69
69
}
70
70
steps {
71
71
script {
@@ -99,6 +99,7 @@ def call(Map configMap = [unityVersions: []]) {
99
99
environment {
100
100
UPM_USER_CONFIG_FILE = credentials(' atlas-upm-credentials' )
101
101
UNITY_PACKAGE_MANAGER = ' upm'
102
+ JAVA_HOME = " ${ JAVA_11_HOME} "
102
103
}
103
104
steps {
104
105
script {
@@ -133,6 +134,9 @@ def call(Map configMap = [unityVersions: []]) {
133
134
agent {
134
135
label " atlas && macos"
135
136
}
137
+ environment {
138
+ JAVA_HOME = " ${ JAVA_11_HOME} "
139
+ }
136
140
steps {
137
141
unstash ' upm_setup_w'
138
142
unstash ' paket_setup_w'
@@ -165,6 +169,7 @@ def call(Map configMap = [unityVersions: []]) {
165
169
environment {
166
170
UNITY_PACKAGE_MANAGER = ' upm'
167
171
UPM_USER_CONFIG_FILE = credentials(' atlas-upm-credentials' )
172
+ JAVA_HOME = " ${ JAVA_11_HOME} "
168
173
}
169
174
steps {
170
175
unstash ' upm_setup_w'
@@ -203,12 +208,12 @@ def call(Map configMap = [unityVersions: []]) {
203
208
steps {
204
209
script {
205
210
parallel paket : {
206
- withEnv([" UNITY_PACKAGE_MANAGER=paket" ]) {
211
+ withEnv([" UNITY_PACKAGE_MANAGER=paket" , " JAVA_HOME= ${ JAVA_11_HOME } " ]) {
207
212
parallel checkSteps(config, " paket check unity " , " paket_setup_w" )
208
213
}
209
214
},
210
215
upm : {
211
- withEnv([" UNITY_PACKAGE_MANAGER=upm" ]) {
216
+ withEnv([" UNITY_PACKAGE_MANAGER=upm" , " JAVA_HOME= ${ JAVA_11_HOME } " ]) {
212
217
parallel checkSteps(config, " upm check unity " , " upm_setup_w" )
213
218
}
214
219
},
@@ -231,6 +236,7 @@ def call(Map configMap = [unityVersions: []]) {
231
236
GRGIT_PASS = " ${ GRGIT_PSW} "
232
237
GITHUB_LOGIN = " ${ GRGIT_USR} "
233
238
GITHUB_PASSWORD = " ${ GRGIT_PSW} "
239
+ JAVA_HOME = " ${ JAVA_11_HOME} "
234
240
}
235
241
236
242
steps {
0 commit comments