Skip to content

Build macOS arm64 and x86_64 #1039

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

Open
dail8859 wants to merge 2 commits into
base: master
Choose a base branch
from
+21 −5
Open

Build macOS arm64 and x86_64 #1039

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c0da4af
Build macOS arm64 and x86_64
dail8859 May 2, 2026
c43d6b5
Try again
dail8859 May 2, 2026
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
25 changes: 20 additions & 5 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,17 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ubuntu-24.04, windows-latest, macos-latest]
os: [ubuntu-24.04, windows-latest, macos-15, macos-15-intel]
qt_version: ["6.5", "6.8", "6.10"]
include:
- os: macos-15
arch: arm64
- os: macos-15-intel
arch: x86_64
- os: ubuntu-24.04
arch: x86_64
- os: windows-latest
arch: x86_64

runs-on: ${{ matrix.os }}

Expand Down Expand Up @@ -60,7 +69,7 @@ jobs:
sudo apt-get install libxkbcommon-dev libxkbcommon-x11-0 fuse libxcb-cursor-dev libcups2-dev

- name: Configure
run: cmake -S . -B build -G Ninja -DCMAKE_BUILD_TYPE=Release -DAPP_DISTRIBUTION=${{ env.DISTRIBUTION }}
run: cmake -S . -B build -G Ninja -DCMAKE_BUILD_TYPE=Release -DAPP_DISTRIBUTION=${{ env.DISTRIBUTION }} ${{ runner.os == 'macOS' && format('-DCMAKE_OSX_ARCHITECTURES={0}', matrix.arch) || '' }}

- name: Build
run: cmake --build build --parallel
Expand Down Expand Up @@ -95,7 +104,7 @@ jobs:
uses: actions/upload-artifact@v6
if: runner.os == 'macOS'
with:
name: NotepadNext-macOS-Qt${{ matrix.qt_version }}
name: NotepadNext-macOS-${{ matrix.arch }}-Qt${{ matrix.qt_version }}
path: ${{ github.workspace }}/build/NotepadNext*.dmg

- name: Upload Linux AppImage
Expand Down Expand Up @@ -141,6 +150,12 @@ jobs:
run: |
gh release upload ${{ github.ref_name }} NotepadNext-Linux-Qt$QT_RELEASE_VER-AppImage/NotepadNext-${{ github.ref_name }}-x86_64.AppImage

- name: Upload macOS App
- name: Upload macOS arm64 DMG
run: |
gh release upload ${{ github.ref_name }} NotepadNext-macOS-Qt$QT_RELEASE_VER/NotepadNext-${{ github.ref_name }}.dmg
gh release upload ${{ github.ref_name }} \
NotepadNext-macOS-arm64-Qt$QT_RELEASE_VER/*.dmg#NotepadNext-${{ github.ref_name }}-macOS-arm64.dmg

- name: Upload macOS x86_64 DMG
run: |
gh release upload ${{ github.ref_name }} \
NotepadNext-macOS-x86_64-Qt$QT_RELEASE_VER/*.dmg#NotepadNext-${{ github.ref_name }}-macOS-x86_64.dmg
1 change: 1 addition & 0 deletions cmake/PackagingMac.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
message(STATUS "Configuring macOS packaging")
message(STATUS "Building for macOS architecture: ${CMAKE_OSX_ARCHITECTURES}")

set(INSTALL_DIR ${CMAKE_BINARY_DIR}/install)

Expand Down