actions/runner-images
1
0
Fork 0
mirror of https://github.com/actions/runner-images.git synced 2026-01-06 18:19:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/main' into macos-retry-downloads

Browse Source
This commit is contained in:
Vladimir Safonkin
2020-11-09 11:00:40 +03:00
parent 1ac24689ce fa9109cc62
commit 3f6213bc8d
40 changed files with 241 additions and 256 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
images/macos/provision/utils/xcode-utils.sh
View File

@@ -9,11 +9,6 @@ createXamarinProvisionatorSymlink() {
FULL_VERSION="12.0.1"
fi
# temporary trick for 12.1.1
if [[ $XCODE_VERSION == "12.1" ]]; then
FULL_VERSION="12.1.1"
fi
if [ $FULL_VERSION != $XCODE_VERSION ]; then
ln -sf "/Applications/Xcode_${XCODE_VERSION}.app" "/Applications/Xcode_${FULL_VERSION}.app"
fi
@@ -24,8 +19,6 @@ getXcodeVersionToInstall() {
if [[ $XCODE_VERSION == "12" ]]; then
echo "12.0.1"
elif [[ $XCODE_VERSION == "12.1" ]]; then
echo "12.1.1 Release Candidate"
elif [[ ! $XCODE_VERSION =~ "_beta" ]]; then
echo "${XCODE_VERSION//_/ }"
else
@@ -62,7 +55,7 @@ runFirstLaunch() {
}
setXcodeDeveloperDirVariables() {
stable_xcode_versions=$(get_xcode_list_from_toolset | tr " " "\n" | grep -v "beta")
stable_xcode_versions=$(get_xcode_list_from_toolset | tr " " "\n" | grep -v "beta" | grep -v "Release_Candidate")
major_versions=($(echo ${stable_xcode_versions[@]} | tr " " "\n" | cut -d '.' -f 1 | uniq))
for MAJOR_VERSION in "${major_versions[@]}"
do