Move to MAC OS 14

jfalcou · Nov 8, 2024 · e6e8c8f · e6e8c8f
1 parent 4e1c54e
commit e6e8c8f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/.github/workflows/unit.yml b/.github/workflows/unit.yml
@@ -19,15 +19,13 @@ jobs:
   ## Mac OS X Targets
   ##################################################################################################
   macosx:
-    runs-on: [macos-12]
+    runs-on: [macos-14]
     strategy:
       fail-fast: false
       matrix:
         cfg:
         - { comp: clang , arch: x86_osx, mode: Debug    }
         - { comp: clang , arch: x86_osx, mode: Release  }
-        - { comp: gcc   , arch: x86_osx, mode: Debug    }
-        - { comp: gcc   , arch: x86_osx, mode: Release  }
     steps:
       - name: Fetch current branch
         uses: actions/checkout@v4.1.1

diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake
@@ -7,7 +7,7 @@
 ##======================================================================================================================
 ## Download and setup CPM
 ##======================================================================================================================
-set(CPM_DOWNLOAD_VERSION 0.34.0)
+set(CPM_DOWNLOAD_VERSION 0.40.2)
 
 if(CPM_SOURCE_CACHE)
   set(CPM_DOWNLOAD_LOCATION "${CPM_SOURCE_CACHE}/cpm/CPM_${CPM_DOWNLOAD_VERSION}.cmake")

diff --git a/test/toolchain/clang.x86_osx.cmake b/test/toolchain/clang.x86_osx.cmake
@@ -3,5 +3,5 @@
 ##  Copyright : SPY Project Contributors
 ##  SPDX-License-Identifier: BSL-1.0
 ##==================================================================================================
-set(CMAKE_C_COMPILER    /usr/local/opt/llvm@15/bin/clang    )
-set(CMAKE_CXX_COMPILER  /usr/local/opt/llvm@15/bin/clang++  )
+set(CMAKE_C_COMPILER    /opt/homebrew/opt/llvm@15/bin/clang   )
+set(CMAKE_CXX_COMPILER  /opt/homebrew/opt/llvm@15/bin/clang++ )