actions/runner-images-sangeeth
1
0
Fork 0
mirror of https://github.com/actions/runner-images-sangeeth.git synced 2025-12-29 21:07:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' of https://github.com/actions/virtual-environments into v-malob/xcode

Browse Source
This commit is contained in:
Maxim Lobanov
2020-11-13 20:37:18 +03:00
parent 6e5366d4f4 f887695075
commit d4cee3bfaa
28 changed files with 362 additions and 314 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
images/macos/provision/core/dotnet.sh
View File

@@ -19,35 +19,20 @@ chmod +x ./dotnet-install.sh
ARGS_LIST=()
echo "Parsing dotnet SDK (except rc and preview versions) from .json..."
# TO-DO: move the list of versions to install to toolset
if is_BigSur; then
DOTNET_CHANNELS=(
'https://raw.githubusercontent.com/dotnet/core/master/release-notes/2.1/releases.json'
'https://raw.githubusercontent.com/dotnet/core/master/release-notes/3.1/releases.json'
)
elif is_Less_Catalina; then
DOTNET_CHANNELS=(
'https://raw.githubusercontent.com/dotnet/core/master/release-notes/2.1/releases.json'
)
else
DOTNET_CHANNELS=(
'https://raw.githubusercontent.com/dotnet/core/master/release-notes/2.1/releases.json'
'https://raw.githubusercontent.com/dotnet/core/master/release-notes/3.0/releases.json'
'https://raw.githubusercontent.com/dotnet/core/master/release-notes/3.1/releases.json'
)
fi
DOTNET_VERSIONS=($(get_toolset_value '.dotnet.versions | .[]'))
for DOTNET_CHANNEL in "${DOTNET_CHANNELS[@]}"; do
for DOTNET_VERSION in "${DOTNET_VERSIONS[@]}"; do
RELEASE_URL="https://raw.githubusercontent.com/dotnet/core/master/release-notes/${DOTNET_VERSION}/releases.json"
# Old Mono versions don't support NuGet versions from .Net sdk >=2.1.6**, exclude them explicitly from Mojave and HS images
# https://rider-support.jetbrains.com/hc/en-us/articles/360004180039
if is_Less_Catalina; then
ARGS_LIST+=(
$(curl -s "$DOTNET_CHANNEL" | \
$(curl -s "$RELEASE_URL" | \
jq -r '.releases[].sdk."version"' | grep -v -E '\-(preview|rc)\d*' | grep -v -E '2.1.[6-9]\d*')
)
else
ARGS_LIST+=(
$(curl -s "$DOTNET_CHANNEL" | \
$(curl -s "$RELEASE_URL" | \
jq -r '.releases[].sdk."version"' | grep -v -E '\-(preview|rc)\d*')
)
fi

5
images/macos/provision/core/python.sh
View File

@@ -5,12 +5,7 @@ source ~/utils/utils.sh
echo "Installing Python Tooling"
echo "Brew Installing Python 3"
# Workaround to have both 3.8 & 3.9(which required by some brew formulas) in the system, but only 3.8 is linked
brew install python@3.8
brew install python@3.9
brew unlink python@3.9
brew unlink python@3.8
brew link python@3.8 --force
echo "Brew Installing Python 2"
# Create local tap with formula due to python2 formula depreciation

7
images/macos/provision/core/xcode-clt.sh
View File

@@ -11,12 +11,7 @@ install_clt() {
# This temporary file prompts the 'softwareupdate' utility to list the Command Line Tools
clt_placeholder="/tmp/.com.apple.dt.CommandLineTools.installondemand.in-progress"
sudo touch $clt_placeholder
# The only working tools for Big Sur are 12.2
if is_Less_BigSur; then
cltPattern="Command Line Tools"
else
cltPattern="Command Line Tools.*Xcode-12.2"
fi
cltPattern="Command Line Tools"
clt_label_command="/usr/sbin/softwareupdate -l |
grep -B 1 -E '${cltPattern}' |