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

[CI] add macOS 14 arm build #333

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[CI] add macOS 14 arm build #333

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 12 additions & 7 deletions .github/workflows/macOS.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,17 @@ on:

jobs:
build:
name: "Build: ${{ matrix.os }}"
name: "Build: ${{ matrix.os }} ${{ matrix.mactype }}"
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
os: [macOS-latest]
os: [macos-12,macos-14]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think just the include is enough

include:
- os: macos-12
mactype: "intel"
- os: macos-14
mactype: "arm"

steps:
- name: Checkout Git Repo
Expand Down Expand Up @@ -67,7 +72,7 @@ jobs:
--icon-size 64 \
--icon 'firebird-emu.app' 125 200 \
--app-drop-link 400 200 \
'firebird-emu_macOS.dmg' \
'firebird-emu_macOS_${{matrix.mactype}}.dmg' \
'/tmp/firebird-emu_macOS/'"
eval "create-dmg $createDmgArgs" || eval "create-dmg $createDmgArgs" # We also retry just in case...

Expand All @@ -80,11 +85,11 @@ jobs:
if: ${{ runner.os == 'macOS' && github.repository == 'nspire-emus/firebird' && env.HAVE_SECRETS == 'true' }}
run: |
xcrun notarytool store-credentials "notarytool-profile" --apple-id "$APPLE_NOTARIZATION_USERNAME" --team-id "$APPLE_NOTARIZATION_TEAMID" --password "$APPLE_NOTARIZATION_PASSWORD"
xcrun notarytool submit "firebird-emu_macOS.dmg" --keychain-profile "notarytool-profile" --wait
xcrun stapler staple "firebird-emu_macOS.dmg"
xcrun notarytool submit "firebird-emu_macOS_${{matrix.mactype}}.dmg" --keychain-profile "notarytool-profile" --wait
xcrun stapler staple "firebird-emu_macOS_${{matrix.mactype}}.dmg"

- name: "Upload DMG"
uses: actions/upload-artifact@v3
with:
name: firebird-emu_macOS
path: firebird-emu_macOS.dmg
name: firebird-emu_macOS_${{matrix.mactype}}
path: firebird-emu_macOS_${{matrix.mactype}}.dmg
Loading