diff --git a/.github/workflows/everything.yml b/.github/workflows/everything.yml index 89c304de60..bf00d264b4 100644 --- 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 deleted file mode 100644 index f4ba0eeabf..0000000000 --- a/scripts/ci/cmake-v2/ci-macos10_15-xcode12_1_1-mpi.cmake +++ /dev/null @@ -1,23 +0,0 @@ -# Client maintainer: chuck.atkins@kitware.com -set(ENV{CC} clang) -set(ENV{CXX} clang++) -set(ENV{FC} gfortran-11) - -set(dashboard_cache " -ADIOS2_USE_Fortran:BOOL=ON -ADIOS2_USE_MPI:BOOL=ON -ADISO2_USE_Python:BOOL=ON - -CMAKE_C_FLAGS:STRING=-Wall -CMAKE_CXX_FLAGS:STRING=-Wall -CMAKE_Fortran_FLAGS:STRING=-Wall -") - -set(ENV{MACOSX_DEPLOYMENT_TARGET} "10.15") -set(CTEST_CMAKE_GENERATOR "Unix Makefiles") -list(APPEND CTEST_UPDATE_NOTES_FILES "${CMAKE_CURRENT_LIST_FILE}") -set(CTEST_TEST_ARGS - # Unclear why these tests currently die. Disabling until it can be addressed. - EXCLUDE "Install.Make.*" -) -include(${CMAKE_CURRENT_LIST_DIR}/ci-common.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 deleted file mode 100644 index 4e4941032e..0000000000 --- a/scripts/ci/cmake-v2/ci-macos10_15-xcode12_1_1-serial.cmake +++ /dev/null @@ -1,23 +0,0 @@ -# Client maintainer: chuck.atkins@kitware.com -set(ENV{CC} clang) -set(ENV{CXX} clang++) -set(ENV{FC} gfortran-11) - -set(dashboard_cache " -ADIOS2_USE_Fortran:BOOL=ON -ADIOS2_USE_MPI:BOOL=OFF -ADISO2_USE_Python:BOOL=ON - -CMAKE_C_FLAGS:STRING=-Wall -CMAKE_CXX_FLAGS:STRING=-Wall -CMAKE_Fortran_FLAGS:STRING=-Wall -") - -set(ENV{MACOSX_DEPLOYMENT_TARGET} "10.15") -set(CTEST_CMAKE_GENERATOR "Unix Makefiles") -list(APPEND CTEST_UPDATE_NOTES_FILES "${CMAKE_CURRENT_LIST_FILE}") -set(CTEST_TEST_ARGS - # Unclear why these tests currently die. Disabling until it can be addressed. - EXCLUDE "Install.Make.*" -) -include(${CMAKE_CURRENT_LIST_DIR}/ci-common.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 deleted file mode 100644 index 386650ef6e..0000000000 --- a/scripts/ci/cmake-v2/ci-macos11-xcode13_0-mpi.cmake +++ /dev/null @@ -1,23 +0,0 @@ -# Client maintainer: chuck.atkins@kitware.com -set(ENV{CC} clang) -set(ENV{CXX} clang++) -set(ENV{FC} gfortran-11) - -set(dashboard_cache " -ADIOS2_USE_Fortran:BOOL=ON -ADIOS2_USE_MPI:BOOL=ON -ADISO2_USE_Python:BOOL=ON - -CMAKE_C_FLAGS:STRING=-Wall -CMAKE_CXX_FLAGS:STRING=-Wall -CMAKE_Fortran_FLAGS:STRING=-Wall -") - -set(ENV{MACOSX_DEPLOYMENT_TARGET} "11.3") -set(CTEST_CMAKE_GENERATOR "Ninja") -list(APPEND CTEST_UPDATE_NOTES_FILES "${CMAKE_CURRENT_LIST_FILE}") -set(CTEST_TEST_ARGS - # Unclear why these tests currently die. Disabling until it can be addressed. - EXCLUDE "Install.Make.*" -) -include(${CMAKE_CURRENT_LIST_DIR}/ci-common.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 index 821ac5357a..5e1bd36186 100644 --- 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 deleted file mode 100644 index 2386f1e72c..0000000000 --- a/scripts/ci/cmake-v2/ci-macos11_12sdk-xcode13_2_1-mpi.cmake +++ /dev/null @@ -1,23 +0,0 @@ -# Client maintainer: chuck.atkins@kitware.com -set(ENV{CC} clang) -set(ENV{CXX} clang++) -set(ENV{FC} gfortran-11) - -set(dashboard_cache " -ADIOS2_USE_Fortran:BOOL=ON -ADIOS2_USE_MPI:BOOL=ON -ADISO2_USE_Python:BOOL=ON - -CMAKE_C_FLAGS:STRING=-Wall -CMAKE_CXX_FLAGS:STRING=-Wall -CMAKE_Fortran_FLAGS:STRING=-Wall -") - -set(ENV{MACOSX_DEPLOYMENT_TARGET} "12.1") -set(CTEST_CMAKE_GENERATOR "Ninja") -list(APPEND CTEST_UPDATE_NOTES_FILES "${CMAKE_CURRENT_LIST_FILE}") -set(CTEST_TEST_ARGS - # Unclear why these tests currently die. Disabling until it can be addressed. - EXCLUDE "Install.Make.*" -) -include(${CMAKE_CURRENT_LIST_DIR}/ci-common.cmake) diff --git a/scripts/ci/cmake-v2/ci-macos11_12sdk-xcode13_2_1-serial.cmake b/scripts/ci/cmake-v2/ci-macos12-xcode13_4_1-serial.cmake similarity index 92% rename from scripts/ci/cmake-v2/ci-macos11_12sdk-xcode13_2_1-serial.cmake rename to scripts/ci/cmake-v2/ci-macos12-xcode13_4_1-serial.cmake index 2d47ad020f..37ceb637c3 100644 --- a/scripts/ci/cmake-v2/ci-macos11_12sdk-xcode13_2_1-serial.cmake +++ b/scripts/ci/cmake-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)