Update macos workflow to 14 (keep 13 as alternate) (#4603)

This commit is contained in:
Allen Byrne 2024-06-26 11:28:38 -05:00 committed by GitHub
parent 0c4041f846
commit 6f503d33f1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 36 additions and 6 deletions

View File

@ -147,7 +147,7 @@ jobs:
# MacOS w/ Clang + CMake
#
name: "MacOS Clang Binary Test"
runs-on: macos-13
runs-on: macos-latest
steps:
- name: Install Dependencies (MacOS)
run: brew install ninja doxygen

View File

@ -33,6 +33,7 @@ jobs:
name:
- "Windows MSVC"
- "Ubuntu gcc"
- "MacOS-13 Clang"
- "MacOS Clang"
# This is where we list the bulk of the options for each configuration.
@ -82,15 +83,35 @@ jobs:
generator: "-G Ninja"
run_tests: true
# MacOS w/ Clang + CMake
#
# We could also build with the Autotools via brew installing them,
# but that seems unnecessary
- name: "MacOS-13 Clang"
os: macos-13
cpp: OFF
fortran: ON
java: ON
docs: ON
libaecfc: ON
localaec: OFF
zlibfc: ON
localzlib: OFF
parallel: OFF
mirror_vfd: ON
direct_vfd: OFF
ros3_vfd: OFF
generator: "-G Ninja"
run_tests: true
# MacOS w/ Clang + CMake
#
# We could also build with the Autotools via brew installing them,
# but that seems unnecessary
- name: "MacOS Clang"
os: macos-13
cpp: ON
fortran: OFF
os: macos-latest
cpp: OFF
fortran: ON
java: ON
docs: ON
libaecfc: ON
@ -134,7 +155,16 @@ jobs:
- name: Install Dependencies (macOS)
run: brew install ninja
if: matrix.os == 'macos-13'
if: ${{ matrix.os == 'macos-13' || matrix.os == 'macos-latest' }}
# symlinks the compiler executables to a common location
- name: Install GNU Fortran (macOS)
uses: fortran-lang/setup-fortran@v1
id: setup-fortran
with:
compiler: gcc
version: 12
if: ${{ matrix.os == 'macos-13' || matrix.os == 'macos-latest' }}
- name: Install Dependencies
uses: ssciwr/doxygen-install@v1
@ -261,4 +291,4 @@ jobs:
name: tgz-osx-${{ inputs.build_mode }}-binary
path: ${{ runner.workspace }}/build/HDF5-*-Darwin.tar.gz
if-no-files-found: error # 'warn' or 'ignore' are also available, defaults to `warn`
if: ${{ (matrix.os == 'macos-13') && (inputs.thread_safety != 'TS') }}
if: ${{ (matrix.os == 'macos-latest') && (inputs.thread_safety != 'TS') }}