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.

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

GitFlow: Merge develop into main for release #73

Merged
merged 2 commits into from
Jun 24, 2024
Merged

GitFlow: Merge develop into main for release #73

merged 2 commits into from
Jun 24, 2024

Conversation

mathomp4
Copy link
Member

This is a GitFlow PR to get the FMS CMake change ( fms_r8FMS::fms_r8 ) into main for a v3.1.0 release.

mathomp4 added 2 commits June 12, 2024 09:24
As we move to FMS in Baselibs, we shouldn't use the old `fms_r4` and `fms_r8` targets
anymore as they are non-standard. Instead we move to `FMS::fms_r4` and `FMS::fms_r8`.
@mathomp4 mathomp4 added the 0 diff trivial The changes in this pull request are trivially zero-diff (documentation, build failure, &c.) label Jun 24, 2024
@mathomp4 mathomp4 requested a review from sanAkel June 24, 2024 12:40
@mathomp4 mathomp4 self-assigned this Jun 24, 2024
@mathomp4 mathomp4 requested a review from a team as a code owner June 24, 2024 12:40
@mathomp4
Copy link
Member Author

As before, this will fail CI since it's looking for the new v12 GEOSgcm.

@mathomp4 mathomp4 merged commit e02093c into main Jun 24, 2024
4 of 7 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
0 diff trivial The changes in this pull request are trivially zero-diff (documentation, build failure, &c.)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants