-
Notifications
You must be signed in to change notification settings - Fork 119
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
[develop] Replace manage_externals with Git submodules #1028
Draft
MichaelLueken
wants to merge
24
commits into
ufs-community:develop
Choose a base branch
from
MichaelLueken:feature/git_submodules
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from all commits
Commits
Show all changes
24 commits
Select commit
Hold shift + click to select a range
0ec3962
Removal of manage_externals from the SRW App repo
MichaelLueken aa44493
Update .gitmodules file to point to required repositories for the SRW…
MichaelLueken 6576ffb
Remove sorc from .gitignore file and add component directories to sorc
MichaelLueken edc55cb
Remove Externals.cfg and existing .gitmodules files
MichaelLueken 9f220fc
Initial addition of Git Submodules
MichaelLueken 875b370
Update hash for AQM-utils
MichaelLueken 31d9431
Update hash for arl_nexus
MichaelLueken 74e8203
Update hash for UFS_UTILS
MichaelLueken be7f7ec
Update hash for ufs-weather-model
MichaelLueken 80643b7
Update hash for UPP
MichaelLueken 7e75858
Add back sorc/*/ to .gitignore
MichaelLueken 4ab59cc
Update ush/setup.py so that it now points to .gitmodules rather than …
MichaelLueken 14570f1
Add branch to the .gitmodules file
MichaelLueken 119533e
[feature/git_submodules] Remove branch entries
MichaelLueken 22d4274
[feature/git_submodules] Add the branch entries back in
MichaelLueken 8850faf
Merge branch 'ufs-community:develop' into feature/git_submodules
MichaelLueken 29e62dd
[feature/git_submodules] Comment out submodule section in .readthedoc…
MichaelLueken a7fab1a
[feature/git_submodules] Removed the submodule section in .readthedoc…
MichaelLueken 8ce2c2d
[feature/git_submodules] Replace manage_externals call to pull the uf…
MichaelLueken a698d09
[feature/git_submodules] Add sorc/ to ufs-weather-model, as ufs-weath…
MichaelLueken e10c3a6
[feature/git_submodules] Add ignore = dirty to the entries in the .gi…
MichaelLueken 4914a9f
Update ufs-weather-model hash to 8518c2c59fd92ec8a5982997d66612992b57…
MichaelLueken 2f2d51b
[feature/git_submodules] Reset example for Friday's presentation
MichaelLueken 9de6b7b
Update weather model hash to 8518c2c
MichaelLueken File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| [submodule "sorc/UFS_UTILS"] | ||
| path = sorc/UFS_UTILS | ||
| url = https://github.com/ufs-community/UFS_UTILS | ||
| branch = develop | ||
| ignore = dirty | ||
| [submodule "sorc/ufs-weather-model"] | ||
| path = sorc/ufs-weather-model | ||
| url = https://github.com/ufs-community/ufs-weather-model | ||
| branch = develop | ||
| ignore = dirty | ||
| [submodule "sorc/UPP"] | ||
| path = sorc/UPP | ||
| url = https://github.com/NOAA-EMC/UPP | ||
| branch = develop | ||
| ignore = dirty | ||
| [submodule "sorc/arl_nexus"] | ||
| path = sorc/arl_nexus | ||
| url = https://github.com/noaa-oar-arl/NEXUS | ||
| branch = develop | ||
| ignore = dirty | ||
| [submodule "sorc/AQM-utils"] | ||
| path = sorc/AQM-utils | ||
| url = https://github.com/NOAA-EMC/AQM-utils | ||
| branch = develop | ||
| ignore = dirty | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@MichaelLueken, the
branchline may not be necessary, but it would be good to addignore = dirtyinstead to exclude any change in the submodules.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thank you very much for the suggestion, @chan-hoo! I will try removing the
branchline and addingignore = dirtyinstead.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
if this helps: In the UFSWM we keep the branch field. It's useful to know in a PR what submodules are bringing in updates and what branch the developer has those updates in as it's important for developers to make branches different names than develop. Maybe not all submodules use a "develop" branch.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks, @BrianCurtis-NOAA! You make a very good point, if users are applying changes to a component, it would be nice to see the fork and branch that they are using for those changes. There is no harm in keeping the
branchline, so I will go ahead and keep it for now.