From fb426fef6bb47d8d9a55940352824fe02b8baa5d Mon Sep 17 00:00:00 2001
From: Valentin Volkl <valentin.volkl@cern.ch>
Date: Thu, 5 Dec 2024 09:31:17 +0100
Subject: [PATCH] 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
---
 .github/workflows/macos.yml | 7 ++++---
 action.yml                  | 7 -------
 setup-cvmfs.sh              | 7 +++----
 3 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index a1d09f2..da2b686 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -10,7 +10,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-latest, macos-11]
+        os: [macos-latest, macos-13]
     steps:
     - uses: actions/checkout@v4
     - uses: ./
@@ -20,7 +20,8 @@ jobs:
       run: |
        echo "### Dump default.local ###"
        cat /etc/cvmfs/default.local
+       sleep 5
        echo "### Try to ls on /Users/Shared/cvmfs/sft.cern.ch/ ###"
-       ls /Users/Shared/cvmfs/sft.cern.ch/
+       ls /Users/Shared/cvmfs/sft.cern.ch/ | grep lcg
        echo "### Try to ls on /cvmfs/sft.cern.ch/ ###"
-       ls /cvmfs/sft.cern.ch/
+       ls /cvmfs/sft.cern.ch/ | grep lcg
diff --git a/action.yml b/action.yml
index 96f4bdb..3ed2149 100644
--- a/action.yml
+++ b/action.yml
@@ -320,13 +320,6 @@ inputs:
     description: 'Location from where to download the Ubuntu deb package of CernVM-FS'
     required: false
     default: 'https://ecsft.cern.ch/dist/cvmfs/cvmfs-release/cvmfs-release-latest_all.deb'
-  cvmfs_macos_pkg_location:
-    description: 'Location from where to download the macOS pkg package of CernVM-FS'
-    required: false
-    #default: 'http://ecsft.cern.ch/dist/cvmfs/cvmfs-release/cvmfs-latest.pkg'
-    # this nightly build is based on the cvmfs mac-fuse-t branch
-    # TODO: change back to latest once it is released
-    default: 'http://ecsft.cern.ch/dist/cvmfs/nightlies/cvmfs-git-1234/cvmfs-2.12.0-0.1234-git-958741c6df468802.pkg'
   cvmfs_config_package:
     description: 'URL to the cvmfs config package to install'
     required: false
diff --git a/setup-cvmfs.sh b/setup-cvmfs.sh
index cf4738b..c7b2e2c 100755
--- a/setup-cvmfs.sh
+++ b/setup-cvmfs.sh
@@ -49,11 +49,10 @@ elif [ "$(uname)" == "Darwin" ]; then
     export CVMFS_HTTP_PROXY='DIRECT'
   fi
 
-  wget -q https://github.com/macos-fuse-t/fuse-t/releases/download/1.0.36/fuse-t-macos-installer-1.0.36.pkg
-  sudo installer -pkg fuse-t-macos-installer-1.0.36.pkg -target /
+  brew tap macos-fuse-t/cask
+  brew tap cvmfs/homebrew-cvmfs
+  brew install cvmfs
 
-  curl -L -o cvmfs-latest.pkg ${CVMFS_MACOS_PKG_LOCATION}
-  sudo installer -package cvmfs-latest.pkg -target /
   # / is readonly on macos 11+ - do 'synthetic firmlink' to create /cvmfs
   sudo zsh -c 'echo -e "cvmfs\tUsers/Shared/cvmfs\n#comment\n" > /etc/synthetic.conf'
   sudo chown root:wheel /etc/synthetic.conf