Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Githubactions for MacOS #428

Merged
merged 3 commits into from
Sep 10, 2024
Merged

Update Githubactions for MacOS #428

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
627a826
Githubactions: Add debug system info
aveenismail Sep 8, 2024
012acf4
Githubactions: Update macos runner os
aveenismail Sep 8, 2024
ec662a1
Githubactions: Update make release script macos
aveenismail Sep 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -229,6 +231,8 @@ jobs:
run: |
set -x

uname -a

# Create directory containing all output
OUTPUT=$GITHUB_WORKSPACE/$PLATFORM/yubihsm-shell
mkdir -p $OUTPUT
Expand Down Expand Up @@ -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
Expand Down
14 changes: 13 additions & 1 deletion resources/release/macos/make_release_binaries.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Loading