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

Change M4AGO tag to dev-1.0.1 #392

Merged

Conversation

TomasTorsvik
Copy link
Contributor

Update release-1.6 branch with latest M4AGo tag.

@TomasTorsvik TomasTorsvik requested a review from jmaerz September 9, 2024 11:06
@TomasTorsvik TomasTorsvik self-assigned this Sep 9, 2024
@TomasTorsvik TomasTorsvik added this to the NorESM2.3 - BLOM/iHAMOCC milestone Sep 9, 2024
Copy link
Collaborator

@jmaerz jmaerz left a comment

Choose a reason for hiding this comment

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

Perfectly fine for me. I hope it resolves NorESMhub/NorESM#556 (comment) , while I am not sure about the wished cime default behavior.

@TomasTorsvik
Copy link
Contributor Author

Thanks, it solves the problem for now.

It looks like there is a general issue with referencing tags in submodules that requires an additional git checkout <tag> if it's not the last commit on a branch (see e.g. https://www.geeksforgeeks.org/how-to-specify-a-branchtag-when-adding-a-git-submodule/). Don't know how this is handled internally in manage_externals.

I need to make a similar PR to the master branch as well.

@TomasTorsvik TomasTorsvik merged commit 1a333a3 into NorESMhub:release-1.6 Sep 9, 2024
6 checks passed
@TomasTorsvik TomasTorsvik deleted the r1.6_update_M4AGO_tag branch September 9, 2024 11:22
@jmaerz
Copy link
Collaborator

jmaerz commented Sep 9, 2024

i @TomasTorsvik , the current BLOM version in NorESM2.3 devel points to the dev-1.0.1 version, which is why the checkout resulted in a conflict (which is why I only updated to that version) - technically, there is a more recent commit that added some more README info.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

2 participants