Try newer Xcode

jdpurcell · Apr 27, 2024 · 6e9b45d · 6e9b45d
1 parent a36fe83
commit 6e9b45d
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 13 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -14,23 +14,23 @@ jobs:
     strategy:
       matrix:
         include:
-          - runner: 'ubuntu-20.04'
-            qtVersion: '5.15.2'
-          - runner: 'macos-13'
+          # - runner: 'ubuntu-20.04'
+          #   qtVersion: '5.15.2'
+          - runner: 'macos-14'
             qtVersion: '6.5.3'
             qtModules: 'qtimageformats'
-          - runner: 'macos-13'
+          - runner: 'macos-14'
             qtVersion: '5.15.2'
             osSuffix: '_legacy'
-          - runner: 'windows-2022'
-            qtVersion: '6.5.3'
-            qtArch: 'win64_msvc2019_64'
-            osSuffix: '_64'
-            qtModules: 'qtimageformats'
-          - runner: 'windows-2022'
-            qtVersion: '5.15.2'
-            qtArch: 'win32_msvc2019'
-            osSuffix: '_32'
+          # - runner: 'windows-2022'
+          #   qtVersion: '6.5.3'
+          #   qtArch: 'win64_msvc2019_64'
+          #   osSuffix: '_64'
+          #   qtModules: 'qtimageformats'
+          # - runner: 'windows-2022'
+          #   qtVersion: '5.15.2'
+          #   qtArch: 'win32_msvc2019'
+          #   osSuffix: '_32'
     runs-on: ${{ matrix.runner }}
     steps:
       - name: Set environment variables

diff --git a/dist/scripts/build.ps1 b/dist/scripts/build.ps1
@@ -6,6 +6,8 @@ param (
 
 if ($IsWindows) {
     dist/scripts/vcvars.ps1
+} elseif ($IsMacOS) {
+    xcode-select --switch /Applications/Xcode_15.3.app
 }
 
 $qtVersion = ((qmake --version -split '\n')[1] -split ' ')[3]