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

Merge branch 'main' into v-sedoli/fix-apt

Browse Source
This commit is contained in:
Maxim Lobanov
2020-11-02 20:10:38 +03:00
committed by GitHub
parent 541036c2d1 cd65cb176f
commit f5e35ccb9d
15 changed files with 824 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
images/macos/provision/configuration/finalize-vm.sh
View File

@@ -30,4 +30,10 @@ npm cache clean --force
yarn cache clean
# Clean up temporary directories
rm -rf ~/utils ~/image-generation
rm -rf ~/utils ~/image-generation
# Erase all indexes and wait until the rebuilding process ends,
# for now there is no way to get status of indexing process, it takes around 3 minutes to accomplish
sudo mdutil -E /
sudo log stream | grep -q -E 'mds.*Released.*BackgroundTask' || true
echo "Indexing completed"

2
images/macos/provision/core/openjdk.sh
View File

@@ -35,7 +35,7 @@ JAVA_DEFAULT=$(get_toolset_value '.java.default')
for JAVA_VERSION in "${JAVA_VERSIONS_LIST[@]}"
do
if [[ $JAVA_VERSION == "7" ]]; then
installAzulJDK "https://cdn.azul.com/zulu/bin/zulu7.40.0.15-ca-jdk7.0.272-macosx_x64.dmg"
installAzulJDK "https://cdn.azul.com/zulu/bin/zulu7.42.0.13-ca-jdk7.0.282-macosx_x64.dmg"
else
brew cask install "adoptopenjdk${JAVA_VERSION}"
fi

1
images/macos/provision/core/pipx-packages.sh
View File

@@ -1,5 +1,4 @@
#!/bin/bash -e -o pipefail
source ~/utils/utils.sh
export PATH="$PATH:/opt/pipx_bin"

2
images/macos/provision/core/python.sh
View File

@@ -10,7 +10,7 @@ brew install python@3.8
brew install python@3.9
brew unlink python@3.9
brew unlink python@3.8
brew link python@3.8
brew link python@3.8 --force
echo "Brew Installing Python 2"
# Create local tap with formula due to python2 formula depreciation

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