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

Bugfix/jstassi/#364 g5 modules perl wrapper #365

Conversation

gmao-jstassi
Copy link
Contributor

Updated g5_modules_perl_wrapper to remove loadmodules option when calling g5_modules, since the option is no longer valid after an update to g5_modules.

@gmao-jstassi gmao-jstassi requested review from a team as code owners December 23, 2024 23:16
@mathomp4
Copy link
Member

@gmao-jstassi a few things.

First, there is a conflict here. I think I can fix it on the CLI if you are fine with that.

Second, this repo requires Changelog entries on non-trivial PRs. Can you add one that encompasses all that is happening here (which seems a lot).

Third, please add a 0 diff or non 0-diff label so we know what to expect when testing.

@gmao-jstassi
Copy link
Contributor Author

gmao-jstassi commented Dec 24, 2024 via email

@mathomp4 mathomp4 changed the base branch from main to feature/rtodling/milan December 24, 2024 14:24
Copy link

Label error. Requires at least 1 of: 0 diff, 0 diff trivial, Non 0-diff, 0 diff structural, 0-diff trivial, Not 0-diff, 0-diff, automatic, 0-diff uncoupled. Found:

@mathomp4
Copy link
Member

We looked and it looks like feature/rtodling/milan was the parent branch of this branch. It does seem like the tag g5.41.3 was based on this branch too:

2024-12-23 18:13 -0500 Joe Stassi        o [bugfix/jstassi/#364-g5_modules_perl_wrapper] {origin/bugfix/jstassi/#364-g5_modules_perl_wrapper} update g5_mod
2024-10-29 12:49 -0400 Ricardo Todling   o <g5.41.3> these started giving trouble after a number of cycles - something is going on that I do not fully unde
2024-10-14 10:35 -0400 Ricardo Todling   o [feature/rtodling/milan] {origin/feature/rtodling/milan} <g5.41.2> now live in GMAO_mksi
...

@mathomp4 mathomp4 requested a review from rtodling December 24, 2024 14:27
@mathomp4 mathomp4 added the 0 diff The changes in this pull request have verified to be zero-diff with the target branch. label Dec 24, 2024
…riables will be correctly expanded in the string if the variables are defined.
Copy link
Collaborator

@rtodling rtodling left a comment

Choose a reason for hiding this comment

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

Thanks for working on this. This is all good except that it cannot be aimed at the branch you point it to: feature/rtodling/milan ... this is a little complicated w/ how gmao-shared is behind in some respects and ahead in others ... let's aim at develop; and I will merge this into some other branch that becomes part of the 5.41 series.

@rtodling rtodling changed the base branch from feature/rtodling/milan to feature/rtodling/541_perl_fixes December 30, 2024 16:23
@rtodling
Copy link
Collaborator

I changed the base for these changes .... I made the base sync w/ the latest in the 5.41 series. @gmao-jstassi what you had was already behind in some respects ... and pointing to a branch that's already been merged in is difficult to reconcile.

@rtodling rtodling merged commit 766a32b into feature/rtodling/541_perl_fixes Dec 30, 2024
10 of 11 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
0 diff The changes in this pull request have verified to be zero-diff with the target branch.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants