Skip to content

CI/macOS: Update to macOS 15 #761

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
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

CI/macOS: Update to macOS 15 #761

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e28271e
ci(macOS): Update macOS runner to version 15
guihkx Oct 16, 2025
60894cf
ci(macOS): Skip installing ninja
guihkx Oct 16, 2025
2ca5266
ci(macOS): Remove unused TARGET_ARCH variable
guihkx Oct 17, 2025
f779f4a
ci(macOS): Remove unneeded CMAKE_BUILD_PARALLEL_LEVEL
guihkx Oct 17, 2025
f1dd087
ci(windows): Skip installing Inno Setup if already installed
guihkx Oct 17, 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
11 changes: 4 additions & 7 deletions .github/workflows/macos.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
fail-fast: false
matrix:
include:
- os: macos-13
- os: macos-15-intel
build-type: debug
steps:
- name: Checkout code
Expand All @@ -25,7 +25,7 @@ jobs:

- name: Install Qt 6 (homebrew)
run: |
brew install ninja qt@6
brew install qt@6

- name: Setup CLang problem matcher
# Technically, this action only supports GCC, but it seems to work well for Clang too.
Expand All @@ -36,7 +36,6 @@ jobs:
env:
VERBOSE: 1
run: |
export CMAKE_BUILD_PARALLEL_LEVEL=$(sysctl -n hw.logicalcpu)
cmake . --warn-uninitialized --warn-unused-vars \
-G Ninja -B build \
-DCMAKE_BUILD_TYPE=${{ matrix.build-type }} \
Expand All @@ -53,7 +52,7 @@ jobs:
fail-fast: false
matrix:
include:
- os: macos-13
- os: macos-15-intel
qt-version: 6.5.2
build-type: release
steps:
Expand Down Expand Up @@ -96,14 +95,12 @@ jobs:

- name: Install dependencies
run: |
brew install create-dmg ninja
brew install create-dmg

- name: Build (${{ matrix.build-type }})
env:
TARGET_ARCH: x86_64;arm64
VERBOSE: 1
run: |
export CMAKE_BUILD_PARALLEL_LEVEL=$(sysctl -n hw.logicalcpu)
cmake . --warn-uninitialized --warn-unused-vars \
-B build -G Ninja \
-DCMAKE_OSX_DEPLOYMENT_TARGET=11.0 \
Expand Down
9 changes: 6 additions & 3 deletions .github/workflows/windows.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,9 +161,12 @@ jobs:

- name: Install latest Inno Setup
run: |
winget install --id JRSoftware.InnoSetup --exact --silent --source winget
# Add to PATH
Add-Content $env:GITHUB_PATH "$env:LOCALAPPDATA\Programs\Inno Setup 6"
# Only installs if Inno Setup's Compiler (ISCC.exe) is not already in the PATH environment variable.
if (-Not (Get-Command ISCC -ErrorAction SilentlyContinue)) {
winget install --id JRSoftware.InnoSetup --exact --silent --source winget
# Add to PATH
Add-Content $env:GITHUB_PATH "$env:LOCALAPPDATA\Programs\Inno Setup 6"
}

- name: Create installer
run: |
Expand Down
6 changes: 0 additions & 6 deletions docs/build_on_macos.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,6 @@ git clone https://github.com/nuttyartist/notes.git --recurse-submodules
cd notes
```

Optionally, if you want to dedicate all cores of your CPU to build Notes much faster, set this environment variable:

```shell
export CMAKE_BUILD_PARALLEL_LEVEL=$(sysctl -n hw.logicalcpu)
```

After that, we're ready to build Notes!

Invoke CMake to configure and build the project into a folder called `build`, in [`Release` mode](https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html):
Expand Down
Loading