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

Develop #146

Merged
merged 6 commits into from
Jul 9, 2024
Merged

Develop #146

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
41dd8e1
Update CI to remove macos-12, add macos-14 and ubuntu-24
mathomp4 May 28, 2024
934218e
Use 4 procs
mathomp4 May 28, 2024
4381399
Merge branch 'develop' into feature/mathomp4/macos-14-ci
tclune Jul 8, 2024
56b1884
Merge pull request #143 from Goddard-Fortran-Ecosystem/feature/mathom…
tclune Jul 8, 2024
abc0df3
CI: Remove macos-11 and -12, add macos-13, -14; Add ubuntu 24, add gf…
mathomp4 Jul 8, 2024
f5811f3
Merge pull request #145 from Goddard-Fortran-Ecosystem/feature/mathom…
tclune Jul 9, 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
29 changes: 18 additions & 11 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,20 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-22.04, macos-11, macos-12]
compiler: [gfortran-10, gfortran-11, gfortran-12, gfortran-13]
os: [ubuntu-22.04, ubuntu-24.04, macos-13, macos-14]
compiler: [gfortran-11, gfortran-12, gfortran-13]
# gfortran-10 is only on ubuntu-22.04
# gfortran-14 is available on ubuntu-24.04
include:
- os: ubuntu-22.04
compiler: gfortran-10
- os: ubuntu-24.04
compiler: gfortran-14
exclude:
- os: macos-11
- os: ubuntu-24.04
compiler: gfortran-11
- os: ubuntu-22.04
compiler: gfortran-13
- os: macos-12
compiler: gfortran-10

# fail-fast if set to 'true' here is good for production, but when
# debugging, set to 'false'. fail-fast means if *any* ci test in the matrix fails
Expand Down Expand Up @@ -65,12 +72,12 @@ jobs:
mkdir -p build
cd build
cmake .. -DCMAKE_Fortran_COMPILER=${FC} -DCMAKE_INSTALL_PREFIX=${HOME}/Software/fArgParse -DCMAKE_PREFIX_PATH=${HOME}/Software/GFE
make -j$(nproc)
make -j4

- name: Build Tests
run: |
cd build
make -j$(nproc) tests
make -j4 tests

- name: Run Tests
run: |
Expand Down Expand Up @@ -141,12 +148,12 @@ jobs:
mkdir -p build
cd build
cmake .. -DCMAKE_Fortran_COMPILER=${FC} -DCMAKE_INSTALL_PREFIX=${HOME}/Software/fArgParse -DCMAKE_PREFIX_PATH=${HOME}/Software/GFE
make -j$(nproc)
make -j4

- name: Build Tests
run: |
cd build
make -j$(nproc) tests
make -j4 tests

- name: Run Tests
run: |
Expand Down Expand Up @@ -197,12 +204,12 @@ jobs:
mkdir -p build
cd build
cmake .. -DCMAKE_Fortran_COMPILER=${FC} -DCMAKE_INSTALL_PREFIX=${HOME}/Software/fArgParse -DCMAKE_PREFIX_PATH=${HOME}/Software/GFE
make -j$(nproc)
make -j4

- name: Build Tests
run: |
cd build
make -j$(nproc) tests
make -j4 tests

- name: Run Tests
run: |
Expand Down
1 change: 1 addition & 0 deletions ChangeLog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Changed

- Added `-quiet` flag for NAG Fortran
- Update CI to remove `macos-12`, add `macos-14` and `ubuntu-24.04`, add `gfortran-14`
- Updated submodule for gFTL-shared (cbb09f4)

## [1.7.0] - 2024-03-04
Expand Down
2 changes: 1 addition & 1 deletion tools/ci-install-gfe.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@ do
cd ${GFE_DIR}/${repo}
mkdir build && cd build
cmake .. -DCMAKE_INSTALL_PREFIX=${GFE_INSTALL_DIR} -DCMAKE_PREFIX_PATH=${GFE_INSTALL_DIR}
make -j$(nproc) install
make -j4 install
done

Loading