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

Remove Xcode 12 beta

Browse Source
This commit is contained in:
Maxim Lobanov
2020-10-06 11:09:20 +03:00
parent 53b1234edd
commit 1ce450def9
4 changed files with 9 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -35,13 +35,7 @@ do
echo "Extracting Xcode.app ($VERSION_TO_INSTALL) to ${WORK_DIR} ..."
extractXcodeXip $WORK_DIR "$VERSION_TO_INSTALL"
# Remove "beta" postfix from version
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
XCODE_VERSION=$(echo $XCODE_VERSION | cut -d"_" -f 1)
echo "Checking if unpacked Xcode ${XCODE_VERSION} is valid"
validateXcodeIntegrity "$WORK_DIR"
@@ -55,9 +49,7 @@ do
# Creating a symlink for all Xcode 10* and Xcode 9.3, 9.4 to stay backwards compatible with consumers of the Xcode beta version
createBetaSymlink $XCODE_VERSION
if [ ! $(echo $XCODE_VERSION | grep "beta") ]; then
createXamarinProvisionatorSymlink "$XCODE_VERSION"
fi
createXamarinProvisionatorSymlink "$XCODE_VERSION"
find $WORK_DIR -mindepth 1 -delete
done
@@ -74,12 +66,7 @@ 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
XCODE_VERSION=$(echo $XCODE_VERSION | cut -d"_" -f 1)
echo "Running 'runFirstLaunch' for Xcode ${XCODE_VERSION}..."
runFirstLaunch $XCODE_VERSION