search

MPAS-Dev / MPAS-Model

Repository for MPAS models and shared framework releases.
241 stars 321 forks source link

Update repository adresses in get_BGC.sh for ocean master branch #407

Open sbrus89 opened 4 years ago

sbrus89 commented 4 years ago

Just a very minor fix. These are up to date in the develop branches, but they still refer to the ACME-Climate repo in the master branch. Thanks to our colleagues in A-1 for catching this!

sbrus89 commented 4 years ago

For reference, this is where the issue is...

From master: https://github.com/MPAS-Dev/MPAS-Model/blob/51d5624709f75182130a2fd94715e1bb13310172/src/core_ocean/get_BGC.sh#L10-L14

From ocean/develop: https://github.com/MPAS-Dev/MPAS-Model/blob/7cb3d6e7cfd7032da2cc4e6c6db94da9c3edac61/src/core_ocean/get_BGC.sh#L9-L13

xylar commented 4 years ago

This is presumably just a matter of waiting until ocean/develop gets merged into master, unless this is a more urgent problem?

I believe the old URL works even though it's not up-to-date.

mark-petersen commented 4 years ago

The old ACME-Climate address forwards to the new E3SM-Project address. For example, git clone git@github.com:ACME-Climate/Ocean-BGC.git works, and https://github.com/ACME-Climate/Ocean-BGC.git forwards to E3SM-Project on a web browser. So there is no action to be taken. As @xylar said, it will update on master for the next release, but there is no harm for now. @sbrus89, does that resolve the issue for you?

sbrus89 commented 4 years ago

I think the issue in this specific case may have been with the svn links. For example: https://github.com/E3SM-Project/Ocean-BGC-src/archive no longer exists.

This is definitely not urgent. I just thought I'd document it.

maltrud commented 4 years ago

to follow up on what @sbrus89 noted, i think this is a case where a collaborator wanted to check out master and the build fails. should they be pointed to ocean/develop instead? in any case, it seems bad that master fails.

mark-petersen commented 4 years ago

I see now. The problem is not the ACME-Climate versus E3SM-Project. That always forwards. The problem is that these lines in both branches:

From master: https://github.com/MPAS-Dev/MPAS-Model/blob/51d5624709f75182130a2fd94715e1bb13310172/src/core_ocean/get_BGC.sh#L3-L5

From ocean/develop: https://github.com/MPAS-Dev/MPAS-Model/blob/7cb3d6e7cfd7032da2cc4e6c6db94da9c3edac61/src/core_ocean/get_BGC.sh#L3-L5

point to hashes, not tags. Therefore this line doesn't work: https://github.com/MPAS-Dev/MPAS-Model/blob/7cb3d6e7cfd7032da2cc4e6c6db94da9c3edac61/src/core_ocean/get_BGC.sh#L76

See, this cvmix tag works. Click on it and it downloads: https://github.com/CVMix/CVMix-src/archive/v0.95-beta.zip But this corresponding bgc hash does not: https://github.com/E3SM-Project/Ocean-BGC-src/archive/5588636.zip Github makes downloadable zip files for tagged commits, but not just any commit.

The A-1 people must have noticed because their set-up led to that wget command, and our systems all use the git clone command. The same thing would happen on ocean/develop.

The solution is to make tags for 9c31e70 and 5588636 on the BGC repo, and change the BGC_TAG= line from a hash to these tags.