Skip to content

PICARD-2192: Fix macos arm builds #2603

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

Merged
merged 3 commits into from
Mar 11, 2025
Merged

PICARD-2192: Fix macos arm builds #2603

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
970c668
CI: Build macOS arm64 builds on actual arm64 runner
phw Mar 11, 2025
0b56fb5
CI: Use actions/setup-python for macOS package
phw Mar 11, 2025
ee9a17e
CI: Include both macOS x86_64 and arm64 packages in Github release
phw Mar 11, 2025
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
18 changes: 11 additions & 7 deletions .github/workflows/package-macos.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,25 +6,21 @@ permissions: {}

jobs:
package-macos:
runs-on: macos-13
runs-on: ${{ matrix.setup.runner }}
strategy:
matrix:
setup:
- macos-deployment-version: '11.0'
runner: 'macos-13'
target-arch: 'x86_64'
python-version: 3.13.1-macos11
python-sha256sum: 67c6f0a3190851e0013214d5abd725a42ec398ff1b50eec47826820fd052d86b
- macos-deployment-version: '11.0'
runner: 'macos-14'
target-arch: 'arm64'
python-version: 3.13.1-macos11
python-sha256sum: 67c6f0a3190851e0013214d5abd725a42ec398ff1b50eec47826820fd052d86b
env:
DISCID_VERSION: 0.6.4
DISCID_SHA256SUM: 829133dd38acbdaa2b989de59e256c8d139ac34cb4dd4b8fd3c9d55a97c824f3
FPCALC_VERSION: 1.5.1
FPCALC_SHA256SUM: d4d8faff4b5f7c558d9be053da47804f9501eaa6c2f87906a9f040f38d61c860
PYTHON_VERSION: ${{ matrix.setup.python-version }}
PYTHON_SHA256SUM: ${{ matrix.setup.python-sha256sum }}
MACOSX_DEPLOYMENT_TARGET: ${{ matrix.setup.macos-deployment-version }}
TARGET_ARCH: ${{ matrix.setup.target-arch }}
CODESIGN: 0
Expand All @@ -33,6 +29,14 @@ jobs:
with:
fetch-depth: 0 # Fetch entire history, needed for setting the build number
- run: git fetch --depth=1 origin +refs/tags/release-*:refs/tags/release-*
- name: Set up Python
uses: actions/setup-python@v5
with:
python-version: 3.13
cache: 'pip'
cache-dependency-path: |
requirements-build.txt
requirements-macos-11.0.txt
- name: Setup macOS build environment
run: |
./scripts/package/macos-setup.sh
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/package.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,12 +85,12 @@ jobs:
python-version: 3.13
- uses: actions/download-artifact@v4
with:
name: macos-app-10.14
name: macos-app-11.0-x86_64
path: artifacts/
- uses: actions/download-artifact@v4
with:
name: macos-app-11.0-arm64
path: artifacts/
# - uses: actions/download-artifact@v4
# with:
# name: windows-signed-app
# path: artifacts/
- uses: actions/download-artifact@v4
with:
name: windows-store-app
Expand Down
2 changes: 1 addition & 1 deletion scripts/package/macos-package-app.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ if [ "$CODESIGN" = '1' ]; then
fi

# Only test the app if it was codesigned, otherwise execution likely fails
if [ "$CODESIGN" = '1' ] && [ "$TARGET_ARCH" = 'x86_64' ]; then
if [ "$CODESIGN" = '1' ]; then
"$APP_BUNDLE/Contents/MacOS/picard-run" --long-version --no-crash-dialog || echo "Failed running picard-run"
VERSIONS=$("$APP_BUNDLE/Contents/MacOS/picard-run" --long-version --no-crash-dialog)
echo "$VERSIONS"
Expand Down
Loading