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 noresm_develop with new blom tag dev1.6.1.10 #607

Closed
TomasTorsvik opened this issue Nov 29, 2024 · 3 comments
Closed

Update noresm_develop with new blom tag dev1.6.1.10 #607

TomasTorsvik opened this issue Nov 29, 2024 · 3 comments
Assignees
Labels
question & help wanted Extra attention is needed
Milestone

Comments

@TomasTorsvik
Copy link
Contributor

I would like to update noresm_develop with the new blom tag dev1.6.1.10. How is this done when using the git fleximod system?

I see that I should update the .gitmodules file, but should I also do something in the components directory?

@TomasTorsvik TomasTorsvik added the question & help wanted Extra attention is needed label Nov 29, 2024
@TomasTorsvik TomasTorsvik added this to the NorESM2.5 milestone Nov 29, 2024
@TomasTorsvik TomasTorsvik linked a pull request Nov 29, 2024 that will close this issue
2 tasks
@gold2718
Copy link

gold2718 commented Nov 29, 2024

Updating a NorESM component tag has two goals:

  • Commit NorESM (top level) so that all component submodules are recorded in the desired state. That is, running git checkout --recurse-submodules <new_tag> at the top level should checkout the NorESM tree to the correct state.
  • Document the correct tag(s) by updating the fxtag entries in the top-level .gitmodules file

I think this is procedure should always work:

  1. In your NorESM clone, create a new update-BLOM-tag branch and fully check it out (git checkout -b update-blom-tag NorESM/noresm_develop && ./bin/git-fleximod update --optional).
    • git submodule status should be 'clean' (the first column is blank for all submodules).
  2. In components/blom, checkout the new tag and run git submodule update.
    • git submodule status should be clean.
  3. At the top level, update the fxtag value in the blom submodule section of the .gitmodules file with the new BLOM tag.
  4. Run git commit -a -m 'Updated BLOM tag to rev.x.y.z.q'.
  5. Push this to your fork and open a PR.

Also, would it be possible make BLOM tags annotated? dev1.6.1.5 is but the others in the dev1.6.1 series are not.

@TomasTorsvik
Copy link
Contributor Author

@gold2718 - Thanks for the procedure. I will copy this into the git-fleximod discussion #599 for later reference.

I was not mindful about the difference between lightweight and annotated tags. It would seem that tags created via the gitHub interface are always lightweight. So annotated tags should be created outside gitHub and be pushed to the repository, before creating the release. Is this procedure documented somewhere?

I have removed the previous tag and created a new annotated dev1.6.1.10 tag.

@TomasTorsvik
Copy link
Contributor Author

I found a bug during testing. This will be addressed with an update on BLOM, followed by a new tag. The BLOM update should target noresm2_5_alpha09, so I will wait with making a new PR until all bug fixes for alpha08 have been merged.

@github-project-automation github-project-automation bot moved this from Todo to Done in NorESM Development Dec 3, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
question & help wanted Extra attention is needed
Projects
Status: Done
Development

Successfully merging a pull request may close this issue.

4 participants