From fbbf28c931a20e0dc47cc7044feaee6a20856465 Mon Sep 17 00:00:00 2001
From: Julien Marrec <julien.marrec@gmail.com>
Date: Tue, 5 Nov 2024 17:50:04 +0100
Subject: [PATCH] hack to get around brew symlink issue + get same SHA as E+
 release

---
 .github/workflows/release_mac.yml | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/release_mac.yml b/.github/workflows/release_mac.yml
index 7c5a916714b..1f6746e03a4 100644
--- a/.github/workflows/release_mac.yml
+++ b/.github/workflows/release_mac.yml
@@ -45,6 +45,11 @@ jobs:
     steps:
     - uses: actions/checkout@v4
 
+    - name: "Reset to develop for git SHA to match the E+ official one"
+      run: |
+        git fetch --all
+        git reset --soft 94a887817b9a5fdfef43c56ab69d1c6fac37d048
+
 #    - name: Setup QtIFW 4.x
 #      uses: jmarrec/setup-qtifw@v1
 #      with:
@@ -125,7 +130,7 @@ jobs:
         brew update
         if [[ "$BUILD_DOCS" != "false" ]]; then
           echo "Using brew to install mactex and adding it to PATH"
-          brew install --cask mactex-no-gui
+          brew install --cask mactex-no-gui || true
           echo "/Library/TeX/texbin" >> $GITHUB_PATH
           echo "DOCUMENTATION_BUILD=BuildWithAll" >> $GITHUB_ENV
         else
@@ -135,9 +140,9 @@ jobs:
         # We use cmake commands to build some subprojects, so setting it globally
         echo MACOSX_DEPLOYMENT_TARGET=${{ matrix.macos_dev_target }} >> $GITHUB_ENV
         echo "Installing gcc@13 for gfortran support of -static-libquadmath"
-        brew list gcc@13 || brew install gcc@13
+        brew list gcc@13 || brew install gcc@13 || true
         which gfortran-13 || echo "FC=$(brew --prefix gcc@13)/bin/gfortran-13" >> $GITHUB_ENV
-        brew install ninja tcl-tk
+        brew install ninja tcl-tk || true
 
     - name: Create Build Directory
       run: cmake -E make_directory ./build/