Test

jdpurcell · Apr 27, 2024 · b171bd4 · b171bd4
1 parent 62a46a8
commit b171bd4
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 12 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -16,10 +16,10 @@ jobs:
         include:
           - runner: 'ubuntu-20.04'
             qtVersion: '5.15.2'
-          - runner: 'macos-12'
+          - runner: 'macos-14'
             qtVersion: '6.5.3'
             qtModules: 'qtimageformats'
-          - runner: 'macos-12'
+          - runner: 'macos-14'
             qtVersion: '5.15.2'
             osSuffix: '_legacy'
           - runner: 'windows-2022'

diff --git a/dist/scripts/build.ps1 b/dist/scripts/build.ps1
@@ -4,25 +4,28 @@ param (
     $Prefix = "/usr"
 )
 
+$qtVersion = ((qmake --version -split '\n')[1] -split ' ')[3]
+Write-Host "Detected Qt Version $qtVersion"
+
 if ($IsWindows) {
     dist/scripts/vcvars.ps1
+} elseif ($IsMacOS) {
+    if ($qtVersion -like '5.*') {
+        # Keep Qt 5.x build on Xcode 14 due to concern over QTBUG-117484
+        sudo xcode-select --switch /Applications/Xcode_14.3.1.app
+    } else {
+        # GitHub macOS 13/14 runners use Xcode 15.0.x by default which has a known linker issue causing crashes if the artifact is run on macOS < 12
+        sudo xcode-select --switch /Applications/Xcode_15.3.app
+    }
 }
 
-$qtVersion = ((qmake --version -split '\n')[1] -split ' ')[3]
-Write-Host "Detected Qt Version $qtVersion"
-
 $qmakeArgs = @(
     "PREFIX=""$Prefix""",
     "DEFINES+=""$env:nightlyDefines"""
 )
 
-if ($IsMacOS) {
-    if ($qtVersion -like '5.*') {
-        # QTBUG-117225
-        $qmakeArgs += @("-early", "QMAKE_DEFAULT_LIBDIRS=""$(xcrun -show-sdk-path)/usr/lib""")
-    } else {
-        $qmakeArgs += "QMAKE_APPLE_DEVICE_ARCHS=""x86_64 arm64"""
-    }
+if ($IsMacOS -and $qtVersion -notlike '5.*') {
+    $qmakeArgs += "QMAKE_APPLE_DEVICE_ARCHS=""x86_64 arm64"""
 }
 
 Write-Host "Running 'qmake' w/ args: $qmakeArgs"