mirror of
https://github.com/actions/runner-images-sangeeth.git
synced 2025-12-29 21:07:59 +08:00
Add macOS 12 image templates (#4062)
This commit is contained in:
@@ -1,6 +1,9 @@
|
||||
#!/bin/bash -e -o pipefail
|
||||
source ~/utils/utils.sh
|
||||
|
||||
# Monterey needs future review:
|
||||
# Llvm, aliyun-cli, gnupg, helm have issues with building from the source code.
|
||||
# Added gmp for now, because toolcache ruby needs its libs. Remove it when php starts to build from source code.
|
||||
common_packages=$(get_toolset_value '.brew.common_packages[]')
|
||||
for package in $common_packages; do
|
||||
echo "Installing $package..."
|
||||
|
||||
@@ -14,7 +14,7 @@ echo "Installing jq..."
|
||||
brew install jq
|
||||
|
||||
echo "Installing curl..."
|
||||
brew_smart_install "curl"
|
||||
brew install curl
|
||||
|
||||
echo "Installing wget..."
|
||||
brew_smart_install "wget"
|
||||
|
||||
@@ -11,4 +11,6 @@ if [ -d "$HOME/.conda" ]; then
|
||||
sudo chown -R $USER "$HOME/.conda"
|
||||
fi
|
||||
|
||||
echo "export CONDA=/usr/local/miniconda" >> $HOME/.bashrc
|
||||
|
||||
invoke_tests "Common" "Miniconda"
|
||||
|
||||
@@ -4,6 +4,10 @@ source ~/utils/utils.sh
|
||||
DEFAULT_RUBY_VERSION=$(get_toolset_value '.ruby.default')
|
||||
echo Installing Ruby...
|
||||
brew_smart_install "ruby@${DEFAULT_RUBY_VERSION}"
|
||||
export PATH=/usr/local/opt/ruby@${DEFAULT_RUBY_VERSION}/bin:$PATH
|
||||
GEM_PATH=`gem env|awk '/EXECUTABLE DIRECTORY/ {print $4}'`
|
||||
echo "GEM_PATH=$GEM_PATH" >> "$HOME/.bashrc"
|
||||
echo 'export PATH="$GEM_PATH:/usr/local/opt/ruby@'${DEFAULT_RUBY_VERSION}'/bin:$PATH"' >> "$HOME/.bashrc"
|
||||
|
||||
#if High Sierra - skip installation from toolset
|
||||
if is_HighSierra; then
|
||||
|
||||
@@ -12,6 +12,10 @@ install_clt() {
|
||||
clt_placeholder="/tmp/.com.apple.dt.CommandLineTools.installondemand.in-progress"
|
||||
sudo touch $clt_placeholder
|
||||
cltPattern="Command Line Tools"
|
||||
# Command Line Tools for Xcode 13.0 does not support macOS 12
|
||||
if is_Monterey; then
|
||||
cltPattern="Command Line Tools beta"
|
||||
fi
|
||||
|
||||
clt_label_command="/usr/sbin/softwareupdate -l |
|
||||
grep -B 1 -E '${cltPattern}' |
|
||||
|
||||
Reference in New Issue
Block a user