Fix recursive merge include#39
Merged
Merged
Conversation
Need to reconsider whole dict/list again if merge include results in another merge include.
twsearle
approved these changes
Apr 4, 2025
Contributor
twsearle
left a comment
There was a problem hiding this comment.
Tested locally against all global-ocean configs, and there are no more sneaky INCLUDES or env variables I can see. I think this is enough for me to approve the merge, although we probably want to retry teh build in sith before handing it over for PS47.
Collaborator
Author
|
I have built a wheel and installed it as 0.6.5rc1 on mobbs-59 on exab and excd. The failed daily tests are now back to life. |
Contributor
|
I have run the default sith tests, so hopefully that should be using mobbs-59 in the following: Testing |
Contributor
|
all looks good to me - even the OSTIA one that was failing in monitoring last Ichecked. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
Need to reconsider whole dict/list again if merge include results in another merge include.
Issue
Resolves #35
Checklist