Skip to content

Commit 4e3d49e

Browse files
committed
Fix 3572: macOS 13 runner is closing down
1 parent c12cd6b commit 4e3d49e

File tree

2 files changed

+19
-9
lines changed

2 files changed

+19
-9
lines changed

.github/workflows/autobuild.yml

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -226,37 +226,36 @@ jobs:
226226

227227
- config_name: MacOS (artifacts)
228228
target_os: macos
229-
building_on_os: macos-14
229+
building_on_os: macos-26
230230
base_command: QT_VERSION=6.9.1 SIGN_IF_POSSIBLE=1 TARGET_ARCHS="x86_64 arm64" ./.github/autobuild/mac.sh
231231
# Disable CodeQL on mac as it interferes with signing the binaries (signing hangs, see #2563 and #2564)
232232
run_codeql: false
233-
# Latest Xcode which runs on macos-14:
234-
xcode_version: 15.4.0
233+
# Latest Xcode which runs on macos-26:
234+
xcode_version: 26.2.0
235235
is_main_build_target: true
236236

237237
# Reminder: If Legacy is removed, be sure to add a dedicated job for CodeQL again.
238238
- config_name: MacOS Legacy (artifacts+CodeQL)
239239
target_os: macos
240-
building_on_os: macos-13
240+
building_on_os: macos-15-intel
241241
base_command: QT_VERSION=5.15.2 SIGN_IF_POSSIBLE=0 ARTIFACT_SUFFIX=_legacy ./.github/autobuild/mac.sh
242242
# Enable CodeQL on mac legacy as this version does not get signed
243243
run_codeql: true
244-
# For Qt5 on Mac, we need to use an unsupported SDK version as macOS 13 doesn't
245-
# support Xcode 12.1 which still ships SDK 10.15.
244+
# macos-15-intel ships with Xcode 16.x; while Qt5 is older, Xcode 16 still supports building it
246245
# https://developer.apple.com/support/xcode/
247246
# https://xcodereleases.com/
248-
xcode_version: 14.2.0
247+
xcode_version: 16.2.0
249248
is_main_build_target: true
250249

251250
- config_name: iOS (artifacts)
252251
target_os: ios
253-
building_on_os: macos-14
252+
building_on_os: macos-15
254253
base_command: QT_VERSION=6.7.3 ./.github/autobuild/ios.sh
255254
# Build failed with CodeQL enabled when last tested 03/2022 (#2490).
256255
# There are no hints that iOS is supposed to be supported by CodeQL.
257256
# Therefore, disable it:
258257
run_codeql: false
259-
xcode_version: 15.4.0
258+
xcode_version: 16.4.0
260259

261260
- config_name: Windows (artifact+codeQL)
262261
target_os: windows

Jamulus.pro

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,17 @@ win32 {
173173
}
174174

175175
} else:macx {
176+
# Set minimum macOS deployment target
177+
# For Qt 5: Support back to macOS 10.13 (High Sierra) for legacy builds on Intel
178+
# For Qt 6: Support macOS 11 (Big Sur) and later for universal binaries
179+
lessThan(QT_MAJOR_VERSION, 6) {
180+
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.13
181+
message(Qt5 build: Setting macOS deployment target to 10.13)
182+
} else {
183+
QMAKE_MACOSX_DEPLOYMENT_TARGET = 11.0
184+
message(Qt6 build: Setting macOS deployment target to 11.0)
185+
}
186+
176187
contains(CONFIG, "server_bundle") {
177188
message(The generated application bundle will run a server instance.)
178189

0 commit comments

Comments
 (0)