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

Jump to bottom

PICARD-2192: Build macOS universal2 binaries with ARM64 (Apple Silicon) support #2423

Draft
wants to merge 3 commits into
base: master
Choose a base branch
from
Draft

PICARD-2192: Build macOS universal2 binaries with ARM64 (Apple Silicon) support #2423

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
f2cf097
PICARD-2192: Use universal2 binary of libdiscid for macOS builds
phw Apr 22, 2024
70bfc72
PICARD-2192: Build universal2 macOS packages for ARM (Apple Silicon) …
phw Apr 22, 2024
7ad428c
Update Python version for macOS build to 3.12.3
phw Apr 22, 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
6 changes: 3 additions & 3 deletions .github/workflows/package-macos.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ jobs:
matrix:
setup:
- macos-deployment-version: 11
python-version: 3.12.1-macos11
python-sha256sum: 6178e42679eb83196240fc58b1438f481c32c2b0557f28ccf43aa7b1b80b7c4a
python-version: 3.12.3-macos11
python-sha256sum: 70a701542ff297760ac5e20f81d0e610aaaa1aba016e411788aa80029e571c5e
env:
DISCID_VERSION: 0.6.4
DISCID_SHA256SUM: 829133dd38acbdaa2b989de59e256c8d139ac34cb4dd4b8fd3c9d55a97c824f3
Expand Down Expand Up @@ -45,7 +45,7 @@ jobs:
- name: Install dependencies
run: |
pip3 install -r requirements-build.txt
pip3 install -r requirements-macos-${MACOSX_DEPLOYMENT_TARGET}.txt
pip3 install --no-binary "charset-normalizer,PyYAML" -r requirements-macos-${MACOSX_DEPLOYMENT_TARGET}.txt
env:
PYINSTALLER_COMPILE_BOOTLOADER: "1"
- name: Run tests
Expand Down
1 change: 1 addition & 0 deletions picard.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@ else:
exe = EXE(pyz,
a.scripts,
exclude_binaries=True,
target_arch='universal2' if os_name == 'Darwin' else None,
# Avoid name clash between picard executable and picard module folder
name='picard' if os_name == 'Windows' else 'picard-run',
debug=False,
Expand Down
2 changes: 1 addition & 1 deletion scripts/package/macos-setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ if [ -n "$DISCID_VERSION" ]; then
wget "ftp://ftp.musicbrainz.org/pub/musicbrainz/libdiscid/$DISCID_FILENAME"
echo "$DISCID_SHA256SUM $DISCID_FILENAME" | shasum --algorithm 256 --check --status
unzip "$DISCID_FILENAME"
cp "libdiscid-$DISCID_VERSION-mac/x86_64/libdiscid.0.dylib" .
cp "libdiscid-$DISCID_VERSION-mac/universal2/libdiscid.0.dylib" .
fi

# Install fpcalc
Expand Down
Loading