Update Githubactions for MacOS (#428)

Githubactions: Update release workflow for MacOS
Yubico · Sep 10, 2024 · 88fc81f · 88fc81f
1 parent 1d25093
commit 88fc81f
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -91,7 +91,7 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - os: macos-latest
+          - os: macos-14-large
             arch: amd
           - os: macos-latest-xlarge
             arch: arm
@@ -122,6 +122,8 @@ jobs:
           set -e -o pipefail
           set -x
           
+          uname -a
+                    
           YHSHELL_SRC_DIR="$GITHUB_WORKSPACE/yubihsm-shell-$VERSION"
 
           cd $YHSHELL_SRC_DIR
@@ -229,6 +231,8 @@ jobs:
         run: |
           set -x
 
+          uname -a
+  
           # Create directory containing all output
           OUTPUT=$GITHUB_WORKSPACE/$PLATFORM/yubihsm-shell
           mkdir -p $OUTPUT
@@ -339,6 +343,8 @@ jobs:
         env:
           PLATFORM: ${{ env.PLATFORM }}
         run: |
+          uname -a
+          
           export CMAKE="cmake"
           export INPUT=$GITHUB_WORKSPACE/yubihsm-shell
           export OUTPUT=$GITHUB_WORKSPACE/$PLATFORM/yubihsm-shell

diff --git a/resources/release/macos/make_release_binaries.sh b/resources/release/macos/make_release_binaries.sh
@@ -6,7 +6,19 @@ ARCH=$1 # amd or arm
 VERSION=$2 # Full yubico-piv-tool version, tex 2.1.0
 SO_VERSION=$3
 
-BREW_LIB="/opt/homebrew/opt"
+if [ "$ARCH" == "amd" ]; then
+  BREW_LIB="/usr/local/opt"
+  #BREW_CELLAR="/usr/local/Cellar"
+elif [ "$ARCH" == "arm" ]; then
+  BREW_LIB="/opt/homebrew/opt"
+  #BREW_CELLAR="/opt/homebrew/Cellar"
+else
+  echo "Unknown architecture"
+  exit
+fi
+
+echo "BREW_LIB: $BREW_LIB"
+ls $BREW_LIB
 
 export PKG_CONFIG_PATH=$BREW_LIB/openssl/lib/pkgconfig