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

Update bom master to upstream master #13

Merged
merged 2 commits into from
Jul 30, 2024

Conversation

hiker
Copy link
Owner

@hiker hiker commented Jul 29, 2024

As part of the code review for ArtefactStore improvements, ALL_SOURCE was renamed to INITIAL_SOURCE, which affects many files (though only trivial renames), and could break other scripts (lfric_atm-fab??)

@hiker hiker requested a review from jasonjunweilyu July 29, 2024 13:45
@hiker
Copy link
Owner Author

hiker commented Jul 29, 2024

@jasonjunweilyu, @lukehoffmann : I wonder if it would be worth to add this repo to lfric_atm-fab as sub-repo. Then we could do a merge like this immediately (I don't think it really needs code review, since it's a merge from upstream master, with trivial conflicts resolved). Then we can fix up lfric_atm, update the module, and would always have a matching fab version with lfric_fab-atm (and it would also make it easier to get something up and running for NG-ARCH).

Copy link
Collaborator

@jasonjunweilyu jasonjunweilyu left a comment

Choose a reason for hiding this comment

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

As the lfric_atm_fab Github repo pipeline has passed, I think this is ready to be merged.

@jasonjunweilyu jasonjunweilyu merged commit 5b51aa1 into bom_master Jul 30, 2024
12 checks passed
@jasonjunweilyu jasonjunweilyu deleted the update_bom_master_to_upstream_master branch July 30, 2024 23:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants