actions/runner-images-sangeeth
1
0
Fork 0
mirror of https://github.com/actions/runner-images-sangeeth.git synced 2025-12-20 06:29:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

[macOS] Reconsider YQ installation on macOS 11 (#8793)

Browse Source 
* [macOS] Reconsider YQ installation on macOS 11

* Revert previous YQ installation related changes
This commit is contained in:
Erik Bershel
2023-11-15 10:31:31 +01:00
committed by GitHub
parent 81ef6f228d
commit 6b001b5325
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
images/macos/provision/core/commonutils.sh
View File

@@ -1,6 +1,12 @@
#!/bin/bash -e -o pipefail #!/bin/bash -e -o pipefail
source ~/utils/utils.sh source ~/utils/utils.sh
# Download and install YQ in cases when it is not available in the formulae as for macOS 11: https://formulae.brew.sh/formula/yq
if is_BigSur; then
download_with_retries "https://github.com/mikefarah/yq/releases/latest/download/yq_darwin_amd64" "/tmp" "yq"
sudo install /tmp/yq /usr/local/bin/yq
fi
# Monterey needs future review: # Monterey needs future review:
# aliyun-cli, gnupg, helm have issues with building from the source code. # 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. # Added gmp for now, because toolcache ruby needs its libs. Remove it when php starts to build from source code.

5
images/macos/provision/core/haskell.sh
View File

@@ -2,11 +2,6 @@
source ~/utils/utils.sh source ~/utils/utils.sh
# https://github.com/actions/runner-images/issues/8738
if is_BigSur; then
brew unlink ghc cabal-install
fi
curl --proto '=https' --tlsv1.2 -fsSL https://get-ghcup.haskell.org | sh curl --proto '=https' --tlsv1.2 -fsSL https://get-ghcup.haskell.org | sh
export PATH="$HOME/.ghcup/bin:$PATH" export PATH="$HOME/.ghcup/bin:$PATH"
echo 'export PATH="$PATH:$HOME/.ghcup/bin"' >> "$HOME/.bashrc" echo 'export PATH="$PATH:$HOME/.ghcup/bin"' >> "$HOME/.bashrc"

1
images/macos/toolsets/toolset-11.json
View File

@@ -220,7 +220,6 @@
"libxft", "libxft",
"tcl-tk", "tcl-tk",
"r", "r",
"yq",
"imagemagick" "imagemagick"
], ],
"cask_packages": [ "cask_packages": [