Skip to content

Commit

Permalink
Update provision.yml
Browse files Browse the repository at this point in the history
  • Loading branch information
rmarinho committed Oct 22, 2024
1 parent 837de85 commit 45ef3ab
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions eng/pipelines/common/provision.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@ steps:

# Setup JDK Paths (gradle needs it)
- bash: |
echo "##vso[task.setvariable variable=JI_JAVA_HOME]$(JAVA_HOME_21_X64)"
echo "##vso[task.setvariable variable=JAVA_HOME]$(JAVA_HOME_21_X64)"
echo "##vso[task.setvariable variable=JI_JAVA_HOME]$(JAVA_HOME_17_X64)"
echo "##vso[task.setvariable variable=JAVA_HOME]$(JAVA_HOME_17_X64)"
displayName: 'Setup JDK Paths'
condition: and(succeeded(), eq(variables['Agent.OS'], 'Darwin'))
# Configure VS Mac for Xcode
Expand Down Expand Up @@ -99,8 +99,8 @@ steps:
INSTALL_DEFAULT_ANDROID_API: 'true'

- pwsh: |
if ($env:JAVA_HOME_21_X64) {
$env:JAVA_HOME = $env:JAVA_HOME_21_X64
if ($env:JAVA_HOME_17_X64) {
$env:JAVA_HOME = $env:JAVA_HOME_17_X64
} else {
$path = (Get-ChildItem $env:ProgramFiles\Microsoft\jdk-17.*\bin\java.exe) | Select-Object -First 1
if ($path -and (Test-Path $path)) {
Expand Down

0 comments on commit 45ef3ab

Please sign in to comment.