Skip to content

Commit

Permalink
Clean up JI_JAVA_TOOL env var setting.
Browse files Browse the repository at this point in the history
  • Loading branch information
jpobst committed Jan 14, 2025
1 parent f792b4e commit 570e018
Showing 1 changed file with 0 additions and 15 deletions.
15 changes: 0 additions & 15 deletions build-tools/automation/yaml-templates/setup-test-environment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,21 +27,6 @@ steps:
jdkMajorVersion: ${{ parameters.jdkMajorVersion }}
useAgentJdkPath: ${{ parameters.useAgentJdkPath }}

# If an explicit Java SDK path wasn't provided, choose JDK-17 for the appropriate architecture
- pwsh: |
Write-Host "##vso[task.setvariable variable=JI_JAVA_HOME]$env:JAVA_HOME_17_X64"
displayName: set JI_JAVA_HOME to JAVA_HOME_17_X64
condition: and(succeeded(), eq('${{ parameters.jdkTestFolder }}', ''), eq(variables['agent.osarchitecture'], 'X64'))

- pwsh: |
Write-Host "##vso[task.setvariable variable=JI_JAVA_HOME]$env:JAVA_HOME_17_arm64"
displayName: set JI_JAVA_HOME to JAVA_HOME_17_arm64
condition: and(succeeded(), eq('${{ parameters.jdkTestFolder }}', ''), eq(variables['agent.osarchitecture'], 'ARM64'))

- script: |
echo $(JI_JAVA_HOME)
displayName: print JI_JAVA_HOME

# Install latest .NET
- template: /build-tools/automation/yaml-templates/use-dot-net.yaml
parameters:
Expand Down

0 comments on commit 570e018

Please sign in to comment.