Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 10 commits into from
Jun 26, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
bd1d3b6
Update macos workflow to 14 (keep 13 as alternate)
byrnHDF Jun 24, 2024
e4ee433
Correct matrix entries
byrnHDF Jun 24, 2024
a5e6ccb
Correct indents
byrnHDF Jun 24, 2024
5996f4b
Use gfortran for macs - gcc-13 is supported across platforms
byrnHDF Jun 24, 2024
363e55d
Revert gfortran back to 12 because of macos failures in config
byrnHDF Jun 24, 2024
ac5eb20
Disable C++ for macos-14 runs
byrnHDF Jun 25, 2024
663b134
test Fort Off for macos-13
byrnHDF Jun 25, 2024
86822b9
Revert Fort change and disable C++ on macos-13
byrnHDF Jun 25, 2024
3ae2de6
Need only one mac binary
byrnHDF Jun 25, 2024
4f97c6e
Change test version of macos
byrnHDF Jun 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/cmake-bintest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
40 changes: 35 additions & 5 deletions .github/workflows/main-cmake.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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') }}
Loading