actions/runner-images
1
0
Fork 0
mirror of https://github.com/actions/runner-images.git synced 2025-12-15 22:26:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bring latest changes from internal Mac-Cloud repository from 21 September

Browse Source
This commit is contained in:
Maxim Lobanov
2020-09-21 09:46:17 +03:00
parent 81b67fbbc5
commit 702796b09b
21 changed files with 143 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
images/macos/provision/core/xcode-tools.sh
View File

@@ -36,7 +36,12 @@ do
extractXcodeXip $WORK_DIR "$VERSION_TO_INSTALL"
# Remove "beta" postfix from version
XCODE_VERSION=$(echo $XCODE_VERSION | cut -d"_" -f 1)
if [[ $XCODE_VERSION == "12_beta" ]] && is_Catalina ; then
# trick to install Xcode 12 GM and Xcode 12 beta 6 side by side
XCODE_VERSION="12_beta"
else
XCODE_VERSION=$(echo $XCODE_VERSION | cut -d"_" -f 1)
fi
echo "Checking if unpacked Xcode ${XCODE_VERSION} is valid"
validateXcodeIntegrity "$WORK_DIR"
@@ -69,6 +74,13 @@ do
continue
fi
if [[ $XCODE_VERSION == "12_beta" ]] && is_Catalina ; then
# trick to install Xcode 12 GM and Xcode 12 beta 6 side by side
XCODE_VERSION="12_beta"
else
XCODE_VERSION=$(echo $XCODE_VERSION | cut -d"_" -f 1)
fi
echo "Running 'runFirstLaunch' for Xcode ${XCODE_VERSION}..."
runFirstLaunch $XCODE_VERSION
done