actions/runner-images
1
0
Fork 0
mirror of https://github.com/actions/runner-images.git synced 2025-12-24 10:28:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

[MacOS] Move preinstalled java distributions to the toolcache directory (#2883)

Browse Source 
* Move java to the toolcache

* resolved comments

* added sudo for ln command

* fixed versions and added symlink

* fixed openjdk.sh

* fixed typo

* updated SoftwareReport

* fixed SoftwareReport

* fixed SoftwareReport

* fixed tool name

Co-authored-by: Nikita Bykov <v-nibyko@microsoft.com>
This commit is contained in:
Nikita Bykov
2021-03-16 17:13:54 +03:00
committed by GitHub
parent 758e6ef267
commit ef6e8c905f
3 changed files with 40 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
images/macos/provision/core/openjdk.sh
View File

@@ -1,28 +1,53 @@
#!/bin/bash -e -o pipefail
source ~/utils/utils.sh
JAVA_TOOLCACHE_PATH=$AGENT_TOOLSDIRECTORY/Java_Adopt_jdk
createEnvironmentVariable() {
local VARIABLE_NAME=$1
local JAVA_VERSION=$2
if [[ $JAVA_VERSION == "8" ]]; then
JAVA_VERSION="1.${JAVA_VERSION}"
local JAVA_VERSION=$1
local JAVA_PATH=$2
local JAVA_HOME_PATH=$JAVA_PATH/Contents/Home
if [[ $JAVA_VERSION == $JAVA_DEFAULT ]]; then
echo "export JAVA_HOME=${JAVA_HOME_PATH}" >> "${HOME}/.bashrc"
fi
local JAVA_PATH=$(/usr/libexec/java_home -v${JAVA_VERSION})
echo "export ${VARIABLE_NAME}=${JAVA_PATH}" >> "${HOME}/.bashrc"
echo "export JAVA_HOME_${JAVA_VERSION}_X64=${JAVA_HOME_PATH}" >> "${HOME}/.bashrc"
}
brew tap AdoptOpenJDK/openjdk
installJavaFromAdoptOpenJDK() {
local JAVA_VERSION=$1
# Get link for Java binaries and Java version
assetUrl=$(curl -s "https://api.adoptopenjdk.net/v3/assets/latest/${JAVA_VERSION}/hotspot")
asset=$(echo $assetUrl | jq -r '.[] | select(.binary.os=="mac" and .binary.image_type=="jdk" and .binary.architecture=="x64")')
archivePath=$(echo $asset | jq -r '.binary.package.link')
fullVersion=$(echo $asset | jq -r '.version.semver')
javaToolcacheVersionPath=$JAVA_TOOLCACHE_PATH/$fullVersion
javaToolcacheVersionArchPath=$javaToolcacheVersionPath/x64
# Download and extract Java binaries
download_with_retries $archivePath /tmp OpenJDK${JAVA_VERSION}.tar.gz
mkdir -p $javaToolcacheVersionArchPath
tar -xzf /tmp/OpenJDK${JAVA_VERSION}.tar.gz -C $javaToolcacheVersionArchPath --strip-components=1
# Create complete file
touch $javaToolcacheVersionPath/x64.complete
createEnvironmentVariable $JAVA_VERSION $javaToolcacheVersionArchPath
# Create a symlink to '/Library/Java/JavaVirtualMachines'
# so '/usr/libexec/java_home' will be able to find Java
sudo ln -sf $javaToolcacheVersionArchPath /Library/Java/JavaVirtualMachines/adoptopenjdk-${JAVA_VERSION}.jdk
}
JAVA_VERSIONS_LIST=($(get_toolset_value '.java.versions | .[]'))
JAVA_DEFAULT=$(get_toolset_value '.java.default')
for JAVA_VERSION in "${JAVA_VERSIONS_LIST[@]}"
do
brew install --cask "adoptopenjdk${JAVA_VERSION}"
createEnvironmentVariable "JAVA_HOME_${JAVA_VERSION}_X64" $JAVA_VERSION
installJavaFromAdoptOpenJDK $JAVA_VERSION
done
createEnvironmentVariable "JAVA_HOME" $JAVA_DEFAULT
echo Installing Maven...
brew_smart_install "maven"