actions/runner-images
1
0
Fork 0
mirror of https://github.com/actions/runner-images.git synced 2025-12-14 22:05:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1889 from maxim-lobanov/v-malob/fix-brew

Browse Source 
Untap local formulas to fix "brew update" command
This commit is contained in:
Maxim Lobanov
2020-10-24 08:11:09 +03:00
committed by GitHub
parent 0d46520ccf bbb8bd3f4c
commit 40bd4f4ca2
2 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
images/macos/provision/core/openssl.sh
View File

@@ -2,18 +2,15 @@
source ~/utils/utils.sh source ~/utils/utils.sh
echo "Installing OpenSSL..."
export PATH="/usr/local/bin:/usr/local/sbin:~/bin:$PATH"
echo Installing OpenSSL... echo Installing OpenSSL...
/usr/local/bin/brew install openssl brew install openssl
# Install OpenSSL 1.0.2t # Install OpenSSL 1.0.2t
# https://www.openssl.org/policies/releasestrat.html - Version 1.0.2 will be supported until 2019-12-31 (LTS) # https://www.openssl.org/policies/releasestrat.html - Version 1.0.2 will be supported until 2019-12-31 (LTS)
# To preserve backward compatibility with ruby-toolcache # To preserve backward compatibility with ruby-toolcache
/usr/local/bin/brew tap-new local/openssl brew tap-new --no-git local/openssl
FORMULA_PATH=$(/usr/local/bin/brew extract openssl local/openssl | grep "Homebrew/Library/Taps") FORMULA_PATH=$(brew extract openssl local/openssl | grep "Homebrew/Library/Taps")
/usr/local/bin/brew install $FORMULA_PATH brew install $FORMULA_PATH
# Set OpenSSL 1.0.2t as default # Set OpenSSL 1.0.2t as default
ln -sf /usr/local/Cellar/openssl@1.0.2t /usr/local/Cellar/openssl ln -sf /usr/local/Cellar/openssl@1.0.2t /usr/local/Cellar/openssl
@@ -25,4 +22,4 @@ ln -sf ../Cellar/openssl/1.0.2t /usr/local/opt/openssl
# https://github.com/microsoft/azure-pipelines-agent/blob/master/docs/start/envosx.md # https://github.com/microsoft/azure-pipelines-agent/blob/master/docs/start/envosx.md
mkdir -p /usr/local/lib/ mkdir -p /usr/local/lib/
ln -s /usr/local/opt/openssl@1.0.2t/lib/libcrypto.1.0.0.dylib /usr/local/lib/ ln -s /usr/local/opt/openssl@1.0.2t/lib/libcrypto.1.0.0.dylib /usr/local/lib/
ln -s /usr/local/opt/openssl@1.0.2t/lib/libssl.1.0.0.dylib /usr/local/lib/ ln -s /usr/local/opt/openssl@1.0.2t/lib/libssl.1.0.0.dylib /usr/local/lib/

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

@@ -6,14 +6,14 @@ echo "Installing Python Tooling"
echo "Brew Installing Python 3" echo "Brew Installing Python 3"
# Workaround to have both 3.8 & 3.9(which required by some brew formulas) in the system, but only 3.8 is linked # Workaround to have both 3.8 & 3.9(which required by some brew formulas) in the system, but only 3.8 is linked
/usr/local/bin/brew install python@3.8 brew install python@3.8
/usr/local/bin/brew install python@3.9 brew install python@3.9
/usr/local/bin/brew unlink python@3.9 brew unlink python@3.9
/usr/local/bin/brew unlink python@3.8 brew unlink python@3.8
/usr/local/bin/brew link python@3.8 brew link python@3.8
echo "Brew Installing Python 2" echo "Brew Installing Python 2"
# Create local tap with formula due to python2 formula depreciation # Create local tap with formula due to python2 formula depreciation
/usr/local/bin/brew tap-new local/python2 brew tap-new --no-git local/python2
FORMULA_PATH=$(/usr/local/bin/brew extract python@2 local/python2 | grep "Homebrew/Library/Taps") FORMULA_PATH=$(brew extract python@2 local/python2 | grep "Homebrew/Library/Taps")
/usr/local/bin/brew install $FORMULA_PATH brew install $FORMULA_PATH