Skip to content

Commit

Permalink
Remove Python.framework in workflow
Browse files Browse the repository at this point in the history
  • Loading branch information
dainnilsson committed Jun 24, 2024
1 parent 99ede24 commit ea723b6
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 4 deletions.
6 changes: 6 additions & 0 deletions .github/workflows/macOS.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,12 @@ jobs:
dist/ykman/ykman --version
[[ -z "$(dist/ykman/ykman --version | grep -E "not found|missing")" ]]
- name: Simplify Python bundle
working-directory: ./dist/ykman/_internal
run: |
mv $(readlink Python) Python
rm -rf Python.framework
- name: Copy scripts
shell: bash
run: cp -r resources/macos dist/scripts
Expand Down
7 changes: 6 additions & 1 deletion resources/macos/make_pkg.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,13 @@ set -x

cd $SCRIPT_DIR

# Ensure executable, since we may have unpacked from zip
chmod +x pkg_scripts/*

mkdir -p pkg/root/usr/local/bin pkg/comp
cp -r $SOURCE_DIR pkg/root/usr/local/
cp -R $SOURCE_DIR pkg/root/usr/local/

# Create a symlink to the main binary that is on the PATH
(cd pkg/root/usr/local/bin && ln -s ../ykman/ykman)

pkgbuild --root="pkg/root" --scripts="pkg_scripts" --identifier "com.yubico.yubikey-manager" --version "$RELEASE_VERSION" "pkg/comp/ykman.pkg"
Expand Down
3 changes: 0 additions & 3 deletions resources/macos/make_release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,6 @@ SOURCE_DIR="$CWD/ykman"
# Ensure executable, since we may have unpacked from zip
chmod +x $SOURCE_DIR/ykman

# Remove Python framework directory as it isn't needed
rm -rf $SOURCE_DIR/_internal/Python.framework

RELEASE_VERSION=`$SOURCE_DIR/ykman --version | awk '{print $(NF)}'`
PKG="yubikey-manager-$RELEASE_VERSION-mac.pkg"

Expand Down

0 comments on commit ea723b6

Please sign in to comment.