actions/runner-images
1
0
Fork 0
mirror of https://github.com/actions/runner-images.git synced 2026-01-09 20:23:52 +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-03 14:56:14 +03:00
parent 338cbea4e2 fb8be2ba62
commit 7e2c8df419
68 changed files with 1526 additions and 328 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
images/macos/provision/utils/utils.sh
View File

@@ -107,4 +107,17 @@ get_default_xcode_from_toolset() {
verlte() {
sortedVersion=$(echo -e "$1\n$2" | sort -V | head -n1)
[ "$1" = "$sortedVersion" ]
}
brew_cask_install_ignoring_sha256() {
local TOOL_NAME=$1
CASK_DIR="$(brew --repo homebrew/cask)/Casks"
chmod a+w "$CASK_DIR/$TOOL_NAME.rb"
SHA=$(grep "sha256" "$CASK_DIR/$TOOL_NAME.rb" | awk '{print $2}')
sed -i '' "s/$SHA/:no_check/" "$CASK_DIR/$TOOL_NAME.rb"
brew cask install $TOOL_NAME
pushd $CASK_DIR
git checkout HEAD -- "$TOOL_NAME.rb"
popd
}

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

@@ -9,6 +9,11 @@ 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
@@ -19,6 +24,8 @@ 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