Skip to content

Commit c792ebd

Browse files
authored
Merge pull request #36 from DrDaveD/pick35
make cvmfs_http_proxy default to DIRECT (v4)
2 parents 55899ca + a91bf86 commit c792ebd

File tree

2 files changed

+2
-6
lines changed

2 files changed

+2
-6
lines changed

action.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,9 +129,9 @@ inputs:
129129
required: false
130130
default: ''
131131
cvmfs_http_proxy:
132-
description: 'Chain of HTTP proxy groups used by CernVM-FS. Necessary.Set to DIRECT if you don’t use proxies.'
132+
description: 'Chain of HTTP proxy groups used by CernVM-FS. Defaults to DIRECT.'
133133
required: false
134-
default: ''
134+
default: 'DIRECT'
135135
cvmfs_ignore_signature:
136136
description: 'When set to yes, don’t verify CernVM-FS file catalog signatures.'
137137
required: false

setup-cvmfs.sh

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,6 @@ elif [ "$(uname)" == "Darwin" ]; then
4444
# Warn about the phasing out of MacOS support for this action
4545
echo "::error::The CernVM-FS GitHub Action's support for MacOS has been \
4646
phased out with macos-10.15."
47-
# Temporary fix for macOS until cvmfs 2.8 is released
48-
if [ -z "${CVMFS_HTTP_PROXY}" ]; then
49-
export CVMFS_HTTP_PROXY='DIRECT'
50-
fi
5147
brew install --cask macfuse
5248
curl -L -o cvmfs-latest.pkg ${CVMFS_MACOS_PKG_LOCATION}
5349
sudo installer -package cvmfs-latest.pkg -target /

0 commit comments

Comments
 (0)