-
Notifications
You must be signed in to change notification settings - Fork 168
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Replace checkout script with submodules (#2142)
Replaces the checkout script with git submodules. This change brings workflow in line with other repos and git standards. Due to these changes, the build system is updated slightly. First, the options that were formerly used with `checkout.sh` to reduce unneeded builds (`-g` for GSI and `-u` for UFSDA) are moved to `build_all.sh` instead. This is needed since build all will not be able to key off directories existing or not to determine which com- ponents to build. Second, the partial build system is removed. It was rarely, if ever, used, and parts of it were already ignored with the previous changes to base builds off whether directories exist. The manage externals file is also removed since that is also not being used. Following these changes, clones/checkout will need to either be recursive, or `git submodule update` will need to be called separately to make sure components are properly checked out (non-exhaustive list): ``` ## Checkout develop (method 1) git clone --recursive https://github.com/NOAA-EMC/global-workflow destination ## Checkout develop (method 2) git clone --jobs 8 https://github.com/NOAA-EMC/global-workflow destination cd destination git submodule update --init --recursive --jobs 8 ## Checkout existing branch some_branch (method 1) git clone --recursive --jobs 8 -b some_branch https://github.com/NOAA-EMC/global-workflow destination ## Checkout existing branch some_branch (method 2) git clone https://github.com/NOAA-EMC/global-workflow destination cd destination git checkout --recurse-submodules some_branch ## Checkout existing branch some_branch (method 3) git clone https://github.com/NOAA-EMC/global-workflow destination cd destination git checkout some_branch git submodule update --init --recursive --jobs 8 ## Checkout new branch new_branch git clone https://github.com/NOAA-EMC/global-workflow destination cd destination git checkout -b new_branch git submodule update --init --recursive --jobs 8 ``` The git ignore list had to be updated to use explicit paths as the wildcard paths pick up the ones that are now submodules. UFS creates files during the build process that are not in its ignore list, so that sub- module ignores the "dirty" state to avoid confusing users running `git status`. CI and documentation are also updated to reflect the changes. Resolves #2141
- Loading branch information
1 parent
1332188
commit bb6151a
Showing
25 changed files
with
163 additions
and
593 deletions.
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,28 @@ | ||
[submodule "sorc/ufs_model.fd"] | ||
path = sorc/ufs_model.fd | ||
url = https://github.com/ufs-community/ufs-weather-model | ||
ignore = dirty | ||
[submodule "sorc/wxflow"] | ||
path = sorc/wxflow | ||
url = https://github.com/NOAA-EMC/wxflow | ||
[submodule "sorc/gfs_utils.fd"] | ||
path = sorc/gfs_utils.fd | ||
url = https://github.com/NOAA-EMC/gfs-utils | ||
[submodule "sorc/ufs_utils.fd"] | ||
path = sorc/ufs_utils.fd | ||
url = https://github.com/ufs-community/UFS_UTILS.git | ||
[submodule "sorc/verif-global.fd"] | ||
path = sorc/verif-global.fd | ||
url = https://github.com/NOAA-EMC/EMC_verif-global.git | ||
[submodule "sorc/gsi_enkf.fd"] | ||
path = sorc/gsi_enkf.fd | ||
url = https://github.com/NOAA-EMC/GSI.git | ||
[submodule "sorc/gdas.cd"] | ||
path = sorc/gdas.cd | ||
url = https://github.com/NOAA-EMC/GDASApp.git | ||
[submodule "sorc/gsi_utils.fd"] | ||
path = sorc/gsi_utils.fd | ||
url = https://github.com/NOAA-EMC/GSI-Utils.git | ||
[submodule "sorc/gsi_monitor.fd"] | ||
path = sorc/gsi_monitor.fd | ||
url = https://github.com/NOAA-EMC/GSI-Monitor.git |
This file was deleted.
Oops, something went wrong.
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
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
Oops, something went wrong.