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

fixes #1522 #1523

Merged
merged 2 commits into from
May 24, 2022
Merged

fixes #1522 #1523

merged 2 commits into from
May 24, 2022

Conversation

bena-nasa
Copy link
Collaborator

@bena-nasa bena-nasa commented May 24, 2022 •
edited
Loading

Fixes #1522
Did as hotfix onto main since this is a bug

Description

Related Issue

Motivation and Context

How Has This Been Tested?

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • Trivial change (affects only documentation or cleanup)

Checklist:

  • I have tested this change with a run of GEOSgcm (if non-trivial)
  • I have added one of the required labels (0 diff, 0 diff trivial, 0 diff structural, non 0-diff)
  • I have updated the CHANGELOG.md accordingly following the style of Keep a Changelog

@bena-nasa bena-nasa added 0 Diff The changes in this pull request have verified to be zero-diff with the target branch. bugfix labels May 24, 2022
@bena-nasa bena-nasa requested a review from a team as a code owner May 24, 2022 15:08
@bena-nasa bena-nasa requested a review from tclune May 24, 2022 15:08
atrayano
atrayano previously approved these changes May 24, 2022
View reviewed changes
@bena-nasa bena-nasa requested a review from a team as a code owner May 24, 2022 16:11
@mathomp4 mathomp4 requested review from atrayano and a team May 24, 2022 16:11
@mathomp4
Copy link
Member

I updated the CI so that GEOSadas build will work on main. Also updated CHANGELOG and CMakeLists.txt for a release.

mathomp4
mathomp4 approved these changes May 24, 2022
View reviewed changes
Copy link
Member

@mathomp4 mathomp4 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@atrayano already approved. My push undid that, so I'll reapprove.

@bena-nasa bena-nasa merged commit 642108c into main May 24, 2022
@bena-nasa bena-nasa deleted the hotfix/bmauer/fixes-#1522 branch May 24, 2022 16:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mathomp4 mathomp4 mathomp4 approved these changes

@tclune tclune Awaiting requested review from tclune

@atrayano atrayano Awaiting requested review from atrayano

Assignees
No one assigned
Labels
0 Diff The changes in this pull request have verified to be zero-diff with the target branch.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Missing RETURN macro
3 participants
@bena-nasa @mathomp4 @atrayano