actions/runner-images
1
0
Fork 0
mirror of https://github.com/actions/runner-images.git synced 2025-12-18 07:46:57 +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} ..." echo "Extracting Xcode.app ($VERSION_TO_INSTALL) to ${WORK_DIR} ..."
extractXcodeXip $WORK_DIR "$VERSION_TO_INSTALL" 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" echo "Checking if unpacked Xcode ${XCODE_VERSION} is valid"
validateXcodeIntegrity "$WORK_DIR" 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 # 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 createBetaSymlink $XCODE_VERSION
if [ ! $(echo $XCODE_VERSION | grep "beta") ]; then createXamarinProvisionatorSymlink "$XCODE_VERSION"
createXamarinProvisionatorSymlink "$XCODE_VERSION"
fi
find $WORK_DIR -mindepth 1 -delete find $WORK_DIR -mindepth 1 -delete
done done
@@ -74,12 +66,7 @@ do
continue continue
fi fi
if [[ $XCODE_VERSION == "12_beta" ]] && is_Catalina ; then XCODE_VERSION=$(echo $XCODE_VERSION | cut -d"_" -f 1)
# 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}..." echo "Running 'runFirstLaunch' for Xcode ${XCODE_VERSION}..."
runFirstLaunch $XCODE_VERSION runFirstLaunch $XCODE_VERSION

2
images/macos/tests/Xcode.Tests.ps1
View File

@@ -40,7 +40,7 @@ Describe "Xcode" {
It "Xcode <XcodeVersion> has correct beta symlink" -TestCases $testCases { It "Xcode <XcodeVersion> has correct beta symlink" -TestCases $testCases {
param ( [string] $XcodeVersion ) param ( [string] $XcodeVersion )
$xcodesWithBetaSymlink = @("12", "12_beta", "9.3", "9.4") $xcodesWithBetaSymlink = @("12", "9.3", "9.4")
$shouldBetaSymlinkExists = $XcodeVersion.StartsWith("10") -or $XcodeVersion.StartsWith("11") -or ($XcodeVersion -in $xcodesWithBetaSymlink) $shouldBetaSymlinkExists = $XcodeVersion.StartsWith("10") -or $XcodeVersion.StartsWith("11") -or ($XcodeVersion -in $xcodesWithBetaSymlink)
$betaSymlinkPath = Get-XcodeRootPath -Version "${XcodeVersion}_beta" $betaSymlinkPath = Get-XcodeRootPath -Version "${XcodeVersion}_beta"

2
images/macos/toolsets/toolset-10.15.json
View File

@@ -2,7 +2,7 @@
"xcode": { "xcode": {
"default": "11.7", "default": "11.7",
"versions": [ "versions": [
"12.2_beta", "12", "12_beta", "11.7", "11.6", "11.5", "11.4.1", "11.4", "11.3.1", "11.2.1", "11.1", "11", "10.3" "12.2_beta", "12", "11.7", "11.6", "11.5", "11.4.1", "11.4", "11.3.1", "11.2.1", "11.1", "11", "10.3"
] ]
}, },
"xamarin": { "xamarin": {

2
images/macos/toolsets/toolset-11.0.json
View File

@@ -2,7 +2,7 @@
"xcode": { "xcode": {
"default": "11.7", "default": "11.7",
"versions": [ "versions": [
"12.2_beta", "12_beta", "11.7" "12.2_beta", "11.7"
] ]
}, },
"xamarin": { "xamarin": {