From 570e0189ee29949d25440448d665b6c27d841276 Mon Sep 17 00:00:00 2001 From: Jonathan Pobst Date: Fri, 10 Jan 2025 08:45:26 -1000 Subject: [PATCH] =?UTF-8?q?=EF=BB=BFClean=20up=20JI=5FJAVA=5FTOOL=20env=20?= =?UTF-8?q?var=20setting.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yaml-templates/setup-test-environment.yaml | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/build-tools/automation/yaml-templates/setup-test-environment.yaml b/build-tools/automation/yaml-templates/setup-test-environment.yaml index b2c92c884d7..e95a9782ece 100644 --- a/build-tools/automation/yaml-templates/setup-test-environment.yaml +++ b/build-tools/automation/yaml-templates/setup-test-environment.yaml @@ -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: