NorESMhub / NorESM

Norwegian Earth System Model and Documentation
https://noresm-docs.readthedocs.io/en/latest/
Other
35 stars 74 forks source link

Update `noresm_develop` with new blom tag `dev1.6.1.10` #607

Open TomasTorsvik opened 3 days ago

TomasTorsvik commented 3 days ago

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?

gold2718 commented 3 days ago

Updating a NorESM component tag has two goals:

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 commented 3 days ago

@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.