diff --git a/action.yml b/action.yml index 665f899..2255209 100644 --- a/action.yml +++ b/action.yml @@ -129,9 +129,9 @@ inputs: required: false default: '' cvmfs_http_proxy: - description: 'Chain of HTTP proxy groups used by CernVM-FS. Necessary.Set to DIRECT if you don’t use proxies.' + description: 'Chain of HTTP proxy groups used by CernVM-FS. Defaults to DIRECT.' required: false - default: '' + default: 'DIRECT' cvmfs_ignore_signature: description: 'When set to yes, don’t verify CernVM-FS file catalog signatures.' required: false diff --git a/setup-cvmfs.sh b/setup-cvmfs.sh index 9ac8863..860ab51 100755 --- a/setup-cvmfs.sh +++ b/setup-cvmfs.sh @@ -44,10 +44,6 @@ elif [ "$(uname)" == "Darwin" ]; then # Warn about the phasing out of MacOS support for this action echo "::error::The CernVM-FS GitHub Action's support for MacOS has been \ phased out with macos-10.15." - # Temporary fix for macOS until cvmfs 2.8 is released - if [ -z "${CVMFS_HTTP_PROXY}" ]; then - export CVMFS_HTTP_PROXY='DIRECT' - fi brew install --cask macfuse curl -L -o cvmfs-latest.pkg ${CVMFS_MACOS_PKG_LOCATION} sudo installer -package cvmfs-latest.pkg -target /