CI: update macOS github OS

ornladios · Aug 30, 2022 · ec801a0 · ec801a0
1 parent 8552472
commit ec801a0
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 101 deletions.
diff --git a/.github/workflows/everything.yml b/.github/workflows/everything.yml
@@ -215,18 +215,15 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [macos10_15, macos11, macos11_12sdk]
+        os: [macos11, macos12]
         parallel: [serial]
         include:
-          - os: macos10_15
-            image: macos-10.15
-            compiler: xcode12_1_1
           - os: macos11
             image: macos-11
             compiler: xcode13_0
-          - os: macos11_12sdk
-            image: macos-11
-            compiler: xcode13_2_1
+          - os: macos12
+            image: macos-12
+            compiler: xcode13_4_1
 
     steps:
       - uses: actions/checkout@v3

diff --git a/scripts/ci/cmake-v2/ci-macos10_15-xcode12_1_1-mpi.cmake b/scripts/ci/cmake-v2/ci-macos10_15-xcode12_1_1-mpi.cmake
diff --git a/scripts/ci/cmake-v2/ci-macos10_15-xcode12_1_1-serial.cmake b/scripts/ci/cmake-v2/ci-macos10_15-xcode12_1_1-serial.cmake
diff --git a/scripts/ci/cmake-v2/ci-macos11-xcode13_0-mpi.cmake b/scripts/ci/cmake-v2/ci-macos11-xcode13_0-mpi.cmake
diff --git a/scripts/ci/cmake-v2/ci-macos11-xcode13_0-serial.cmake b/scripts/ci/cmake-v2/ci-macos11-xcode13_0-serial.cmake
@@ -1,4 +1,4 @@
-# Client maintainer: chuck.atkins@kitware.com
+# Client maintainer: vicente.bolea@kitware.com
 set(ENV{CC}  clang)
 set(ENV{CXX} clang++)
 set(ENV{FC}  gfortran-11)

diff --git a/scripts/ci/cmake-v2/ci-macos11_12sdk-xcode13_2_1-mpi.cmake b/scripts/ci/cmake-v2/ci-macos11_12sdk-xcode13_2_1-mpi.cmake
diff --git a/...ci-macos11_12sdk-xcode13_2_1-serial.cmake → ...ke-v2/ci-macos12-xcode13_4_1-serial.cmake b/...ci-macos11_12sdk-xcode13_2_1-serial.cmake → ...ke-v2/ci-macos12-xcode13_4_1-serial.cmake
@@ -1,4 +1,4 @@
-# Client maintainer: chuck.atkins@kitware.com
+# Client maintainer: vicente.bolea@kitware.com
 set(ENV{CC}  clang)
 set(ENV{CXX} clang++)
 set(ENV{FC}  gfortran-11)