Skip to content

Commit acb4fd1

Browse files
authored
Merge pull request #3579 from pljones/autobuild-fixes-3572/macos-13-runner-is-closing-down
Fixes 3572: macOS 13 runner is closing down
2 parents 7cfe0f5 + 4f5212b commit acb4fd1

File tree

1 file changed

+7
-9
lines changed

1 file changed

+7
-9
lines changed

.github/workflows/autobuild.yml

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

227227
- config_name: MacOS (artifacts)
228228
target_os: macos
229-
building_on_os: macos-14
229+
building_on_os: macos-15
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+
xcode_version: 16.3.0
235234
is_main_build_target: true
236235

237236
# Reminder: If Legacy is removed, be sure to add a dedicated job for CodeQL again.
238237
- config_name: MacOS Legacy (artifacts+CodeQL)
239238
target_os: macos
240-
building_on_os: macos-13
239+
building_on_os: macos-15-intel
241240
base_command: QT_VERSION=5.15.2 SIGN_IF_POSSIBLE=0 ARTIFACT_SUFFIX=_legacy ./.github/autobuild/mac.sh
242241
# Enable CodeQL on mac legacy as this version does not get signed
243242
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.
243+
# macos-15-intel ships with Xcode 16.x; while Qt5 is older, Xcode 16 still supports building it
246244
# https://developer.apple.com/support/xcode/
247245
# https://xcodereleases.com/
248-
xcode_version: 14.2.0
246+
xcode_version: 16.3.0
249247
is_main_build_target: true
250248

251249
- config_name: iOS (artifacts)
252250
target_os: ios
253-
building_on_os: macos-14
251+
building_on_os: macos-15
254252
base_command: QT_VERSION=6.7.3 ./.github/autobuild/ios.sh
255253
# Build failed with CodeQL enabled when last tested 03/2022 (#2490).
256254
# There are no hints that iOS is supposed to be supported by CodeQL.
257255
# Therefore, disable it:
258256
run_codeql: false
259-
xcode_version: 15.4.0
257+
xcode_version: 16.3.0
260258

261259
- config_name: Windows (artifact+codeQL)
262260
target_os: windows

0 commit comments

Comments
 (0)