Skip to content

Commit de6742e

Browse files
authored
Merge pull request #46 from Goddard-Fortran-Ecosystem/feature/enable-tests
2 parents 9be1379 + 3dcd05a commit de6742e

File tree

5 files changed

+24
-3
lines changed

5 files changed

+24
-3
lines changed

.github/workflows/main.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ jobs:
2020
# gfortran-10 and -11 are only on ubuntu-22.04
2121
# gfortran-13, -14, and -15 are not on ubuntu-22.04
2222
# gfortran-15 is only on macos
23+
# gfortran-12 is not on macos
2324
include:
2425
- os: ubuntu-22.04
2526
compiler: gfortran-10
@@ -34,6 +35,10 @@ jobs:
3435
compiler: gfortran-15
3536
- os: ubuntu-24.04
3637
compiler: gfortran-15
38+
- os: macos-14
39+
compiler: gfortran-12
40+
- os: macos-15
41+
compiler: gfortran-12
3742

3843
# fail-fast if set to 'true' here is good for production, but when
3944
# debugging, set to 'false'. fail-fast means if *any* ci test in the matrix fails

CMakeLists.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
cmake_minimum_required(VERSION 3.24)
22
project (GFE
3-
VERSION 1.21.0
3+
VERSION 1.22.0
44
LANGUAGES Fortran
55
)
66
cmake_policy(SET CMP0074 NEW)
@@ -17,6 +17,9 @@ endif()
1717

1818
enable_testing()
1919

20+
# Pass down option to enable building of tests in subdirectories
21+
set(ENABLE_TESTS ON CACHE BOOL "Enable building of tests")
22+
2023
add_subdirectory(gFTL)
2124
add_subdirectory(gFTL-shared)
2225
add_subdirectory(fArgParse)

ChangeLog.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,19 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
55

66
## [Unreleased]
77

8+
## [1.22.0] - 2025-11 24
9+
10+
### Changed
11+
12+
- Update pFUnit to v4.15.0
13+
- Workaround for complex flang use case.
14+
- Modified an internal interface so that `load_tests` is now a subroutine.
15+
- Also added a subroutine version of `TestSuite::filter()` (called `filter_sub()`
16+
- Undo accidental case change in `add_pfunit_test` (introduced in #509) which led to empty `_TEST_SUITES`
17+
- Enable `build-tests` and `tests` targets only if `ENABLE_TESTS` is `ON`.
18+
- Set `ENABLE_TESTS` to `ON` for subprojects
19+
- Remove `gfortran-12` from macos CI
20+
821
## [1.21.0] - 2025-10-14
922

1023
### Changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ This repo is intended to be a single fixture for the [Goddard Fortran Ecosystem]
99
| gFTL | v1.16.0 |
1010
| gFTL-shared | v1.11.0 |
1111
| fArgParse | v1.10.0 |
12-
| pFUnit | v4.14.0 |
12+
| pFUnit | v4.15.0 |
1313
| yaFyaml | v1.6.0 |
1414
| pFlogger | v1.17.0 |
1515

0 commit comments

Comments
 (0)