Change the way java home is set on Mac OS for CI and Java publishing pipeline (#4385)

* Change the way java_home is set on Mac.

* Change the way JAVA_HOME is set on Mac OS
This commit is contained in:
Dmitri Smirnov 2020-07-01 07:37:14 -07:00 committed by GitHub
parent 6365760906
commit 49268c42da
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 6 deletions

View file

@ -45,9 +45,7 @@ jobs:
- template: templates/set-version-number-variables-step.yml
- script: |
export JAVA_HOME=/Library/Java/JavaVirtualMachines/zulu-11.jdk/Contents/Home
java --version
javac --version
export JAVA_HOME=$(java_home -v 11)
sudo python3 -m pip install -r '$(Build.SourcesDirectory)/tools/ci_build/github/linux/docker/scripts/requirements.txt'
sudo xcode-select --switch /Applications/Xcode_10.app/Contents/Developer
python3 $(Build.SourcesDirectory)/tools/ci_build/build.py --build_dir $(Build.BinariesDirectory) --skip_submodule_sync --parallel --build_java --build_shared_lib --config RelWithDebInfo

View file

@ -24,9 +24,7 @@ jobs:
inputs:
versionSpec: '12.x'
- script: |
export JAVA_HOME=/Library/Java/JavaVirtualMachines/zulu-11.jdk/Contents/Home
java --version
javac --version
export JAVA_HOME=$(java_home -v 11)
sudo python3 -m pip install -r '$(Build.SourcesDirectory)/tools/ci_build/github/linux/docker/scripts/requirements.txt'
sudo xcode-select --switch /Applications/Xcode_10.app/Contents/Developer