Skip to content

Commit fb426fe

Browse files
authored
CVMFS mac support now in prod; use homebrew to install (#31)
* CVMFS mac support now in prod; use homebrew to install * update macos os label * update macos os label * update test
1 parent e5c2896 commit fb426fe

File tree

3 files changed

+7
-14
lines changed

3 files changed

+7
-14
lines changed

.github/workflows/macos.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
strategy:
1111
fail-fast: false
1212
matrix:
13-
os: [macos-latest, macos-11]
13+
os: [macos-latest, macos-13]
1414
steps:
1515
- uses: actions/checkout@v4
1616
- uses: ./
@@ -20,7 +20,8 @@ jobs:
2020
run: |
2121
echo "### Dump default.local ###"
2222
cat /etc/cvmfs/default.local
23+
sleep 5
2324
echo "### Try to ls on /Users/Shared/cvmfs/sft.cern.ch/ ###"
24-
ls /Users/Shared/cvmfs/sft.cern.ch/
25+
ls /Users/Shared/cvmfs/sft.cern.ch/ | grep lcg
2526
echo "### Try to ls on /cvmfs/sft.cern.ch/ ###"
26-
ls /cvmfs/sft.cern.ch/
27+
ls /cvmfs/sft.cern.ch/ | grep lcg

action.yml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -320,13 +320,6 @@ inputs:
320320
description: 'Location from where to download the Ubuntu deb package of CernVM-FS'
321321
required: false
322322
default: 'https://ecsft.cern.ch/dist/cvmfs/cvmfs-release/cvmfs-release-latest_all.deb'
323-
cvmfs_macos_pkg_location:
324-
description: 'Location from where to download the macOS pkg package of CernVM-FS'
325-
required: false
326-
#default: 'http://ecsft.cern.ch/dist/cvmfs/cvmfs-release/cvmfs-latest.pkg'
327-
# this nightly build is based on the cvmfs mac-fuse-t branch
328-
# TODO: change back to latest once it is released
329-
default: 'http://ecsft.cern.ch/dist/cvmfs/nightlies/cvmfs-git-1234/cvmfs-2.12.0-0.1234-git-958741c6df468802.pkg'
330323
cvmfs_config_package:
331324
description: 'URL to the cvmfs config package to install'
332325
required: false

setup-cvmfs.sh

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,10 @@ elif [ "$(uname)" == "Darwin" ]; then
4949
export CVMFS_HTTP_PROXY='DIRECT'
5050
fi
5151

52-
wget -q https://github.com/macos-fuse-t/fuse-t/releases/download/1.0.36/fuse-t-macos-installer-1.0.36.pkg
53-
sudo installer -pkg fuse-t-macos-installer-1.0.36.pkg -target /
52+
brew tap macos-fuse-t/cask
53+
brew tap cvmfs/homebrew-cvmfs
54+
brew install cvmfs
5455

55-
curl -L -o cvmfs-latest.pkg ${CVMFS_MACOS_PKG_LOCATION}
56-
sudo installer -package cvmfs-latest.pkg -target /
5756
# / is readonly on macos 11+ - do 'synthetic firmlink' to create /cvmfs
5857
sudo zsh -c 'echo -e "cvmfs\tUsers/Shared/cvmfs\n#comment\n" > /etc/synthetic.conf'
5958
sudo chown root:wheel /etc/synthetic.conf

0 commit comments

Comments
 (0)