Skip to content

Commit

Permalink
Merge pull request #221 from Goddard-Fortran-Ecosystem/develop
Browse files Browse the repository at this point in the history
Planning release - merge develop into main
  • Loading branch information
tclune authored Mar 20, 2024
2 parents a7b112b + 9cd732e commit 74d6775
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 5 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-22.04, macos-11, macos-12]
os: [ubuntu-22.04, macos-12, macos-13]
compiler: [gfortran-10, gfortran-11, gfortran-12, gfortran-13]
exclude:
- os: macos-11
compiler: gfortran-13
- os: macos-12
compiler: gfortran-10
- os: macos-13
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
5 changes: 4 additions & 1 deletion ChangeLog.MD
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,17 @@

## Unreleased


## Fixed

- Implemented workarounds for ifx compiler and v1 interfaces. v2 tests were fine.
1. Removed previous workaround for older Intel compilers that did not support polymorphic assignment.
2. Introduced workaround for comparing polymorphic pointers for Set and altSet

## Fixed
### Changed

- Removed `macos-11` from CI, added `macos-13`
- Added `-quiet` flag for NAG compiler
- Removed stray print statements in tests.

## [1.12.0] - 2024-03-03
Expand Down
2 changes: 1 addition & 1 deletion cmake/NAG.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ set (check_all "-C=all -nocheck_modtime")
set (cpp "-fpp")
set (suppress_fpp_warnings "-w")

set (CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -g ${cpp} -nocheck_modtime -w=x95")
set (CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -g -quiet ${cpp} -nocheck_modtime -w=x95")
set (CMAKE_Fortran_FLAGS_DEBUG "${CMAKE_Fortran_FLAGS} ${no_optimize} ${traceback} ${check_all}")
set (CMAKE_Fortran_FLAGS_RELEASE "${CMAKE_Fortran_FLAGS} -O3")

0 comments on commit 74d6775

Please sign in to comment.