MacOS 14

talisein · Sep 20, 2024 · f3a381e · f3a381e
1 parent 5d48b6d
commit f3a381e
Showing 1 changed file with 21 additions and 10 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -35,7 +35,7 @@ jobs:
           - flavor: ubuntu
             os: ubuntu-24.04
           - flavor: mac
-            os: macos-12
+            os: macos-14
           - flavor: windows
             os: windows-latest
           # CC
@@ -52,15 +52,15 @@ jobs:
             CXX_LD: lld
             is-experimental: true
           # Mac stuff
-          - DEVELOPER_DIR: /Applications/Xcode_14.1.app/Contents/Developer
+          - DEVELOPER_DIR: /Applications/Xcode_15.2.app/Contents/Developer
             flavor: mac
         exclude:
           - flavor: windows
             compiler: gcc
           - flavor: windows
             compiler: clang
-          - flavor: mac
-            compiler: clang
+#          - flavor: mac
+#            compiler: clang
           - flavor: mac
             compiler: msvc
           - flavor: ubuntu
@@ -84,7 +84,7 @@ jobs:
       - if: ${{ matrix.compiler == 'clang' && matrix.flavor == 'ubuntu' }}
         name: Install clang ubuntu
         run: |
-          sudo apt-get install clang libc++-dev libc++abi-dev libstdc++-14-dev
+          sudo apt-get install clang libc++-dev libc++abi-dev libstdc++-14-dev libhowardhinnant-date-dev
 
       - if: ${{ matrix.compiler == 'gcc' && matrix.flavor == 'ubuntu' }}
         name: Install gcc ubuntu
@@ -105,7 +105,7 @@ jobs:
           sudo apt-get install ninja-build liboutcome-dev libboost-ext-ut-dev libctre-dev libmagicenum-dev jq findutils meson
 #          python -m pip install meson
 
-      - if: ${{ matrix.flavor == 'mac' }}
+      - if: ${{ matrix.flavor == 'mac' && matrix.compiler == 'gcc' }}
         name: Install deps mac
         run: |
           brew search gcc@
@@ -281,16 +281,27 @@ jobs:
           chmod u+x dregarnuhr-ubuntu-24.04-gcc/dregarnuhr
           dregarnuhr-ubuntu-24.04-gcc/dregarnuhr --check --verbose
 
-  check-run-macos-12:
+  check-run-macos-14:
+    needs: build
+    runs-on: macos-14
+    steps:
+      - name: Download Artifacts
+        uses: actions/download-artifact@v4
+
+      - run: |
+          chmod u+x dregarnuhr-macos-14-gcc/dregarnuhr
+          dregarnuhr-macos-14-gcc/dregarnuhr --check --verbose
+
+  check-run-macos-14-clang:
     needs: build
-    runs-on: macos-12
+    runs-on: macos-14
     steps:
       - name: Download Artifacts
         uses: actions/download-artifact@v4
 
       - run: |
-          chmod u+x dregarnuhr-macos-12-gcc/dregarnuhr
-          dregarnuhr-macos-12-gcc/dregarnuhr --check --verbose
+          chmod u+x dregarnuhr-macos-14-clang/dregarnuhr
+          dregarnuhr-macos-14-clang/dregarnuhr --check --verbose
 
   check-run-win:
     needs: build