search

NorESMhub / NorESM

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

manage_externals broken in noresm2_3_develop #556

Open gold2718 opened 2 weeks ago

gold2718 commented 2 weeks ago

After running ./manage_externals/checkout_externals on the noresm2_3_develop branch, rerunning the command fails due to a bad status check (running ./manage_externals/checkout_externals --status shows the same bad status):

 M  ./components/blom

To Reproduce Steps to reproduce the behavior:

  1. Checkout noresm2_3_develop: (git checkout <origin>/noresm2_3_develop)
  2. Run manage_externals: (./manage_externals/checkout_externals)
  3. Attempt to run manage_externals again (./manage_externals/checkout_externals)

Expected behavior The second run should complete with no errors and no actions.

TomasTorsvik commented 2 weeks ago

The problem is apparently caused by the M4AGO-sinking-scheme submodule

In the blom component

diff --git a/pkgs/M4AGO-sinking-scheme b/pkgs/M4AGO-sinking-scheme
index 99db47f..82568db 160000
--- a/pkgs/M4AGO-sinking-scheme
+++ b/pkgs/M4AGO-sinking-scheme
@@ -1 +1 @@
-Subproject commit 99db47ff6328eb7e006257ae0bc9ed5cc588f711
+Subproject commit 82568dbe4ee402804894020ccf602cff0d0a251e
gold2718 commented 2 weeks ago

The problem is apparently caused by the M4AGO-sinking-scheme submodule

Yes, this is the reason manage_externals reports a modification. However, because that modification was created by manage_externals (because the Externals_BLOM.cfg file overrides the committed submodule hash), I think it should understand that and not report a modification.

jmaerz commented 2 weeks ago

Dear @gold2718 and @TomasTorsvik , just in case: I can tag the 99db47ff... M4AGO commit, so that it becomes easier to handle this, if needed (and/or update the commit in BLOM to the most recent version).

TomasTorsvik commented 2 weeks ago

@jmaerz - thanks, that should solve the immediate problem.

jmaerz commented 2 weeks ago

Hi @TomasTorsvik , I just pushed tag dev-1.0.1 which is equivalent to sha 99db47ff632, so you can change the BLOM_externals.cfg file for the new tag - which hopefully resolves the immediate issue - while I am not sure, if it should be the default behavior of cime to cause issues when checking out the externals transmitted through a component externals file.