-
Notifications
You must be signed in to change notification settings - Fork 32
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
remove git stash sections and expand PEOPLE list in stable_driver.sh (#…
- Loading branch information
1 parent
dcf8f9c
commit 1365231
Showing
1 changed file
with
1 addition
and
13 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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -73,7 +73,7 @@ $gdasdir/ush/submodules/update_develop.sh $gdasdir | |
|
||
# ============================================================================== | ||
# email information | ||
PEOPLE="[email protected]" | ||
PEOPLE="[email protected] [email protected] [email protected]" | ||
BODY=$stableroot/$datestr/stable_nightly | ||
|
||
# ============================================================================== | ||
|
@@ -84,12 +84,6 @@ total=0 | |
if [ $ci_status -eq 0 ]; then | ||
cd $gdasdir | ||
# checkout feature/stable-nightly | ||
##git stash | ||
rc=$? | ||
total=$(($total+$rc)) | ||
if [ $rc -ne 0 ]; then | ||
echo "Unable to git stash" >> $stableroot/$datestr/output | ||
fi | ||
git checkout feature/stable-nightly | ||
rc=$? | ||
total=$(($total+$rc)) | ||
|
@@ -104,12 +98,6 @@ if [ $ci_status -eq 0 ]; then | |
echo "Unable to merge develop" >> $stableroot/$datestr/output | ||
fi | ||
# add in submodules | ||
##git stash pop | ||
rc=$? | ||
total=$(($total+$rc)) | ||
if [ $rc -ne 0 ]; then | ||
echo "Unable to git stash pop" >> $stableroot/$datestr/output | ||
fi | ||
$gdasdir/ush/submodules/add_submodules.sh $gdasdir | ||
rc=$? | ||
total=$(($total+$rc)) | ||
|