Skip to content
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.

Sign up for GitHub

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

clean up stable_driver.sh #1434

Merged
merged 5 commits into from
Jan 10, 2025
Merged

clean up stable_driver.sh #1434

Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
dcf8f9c
initial commit of modified stable_driver.sh (#1433)
RussTreadon-NOAA Jan 8, 2025
1365231
remove git stash sections and expand PEOPLE list in stable_driver.sh …
RussTreadon-NOAA Jan 8, 2025
d1ff5d5
Merge branch 'develop' into feature/improve_stable_driver
RussTreadon-NOAA Jan 10, 2025
943d87b
add patch to allow MSU role account to run CI (#1433)
RussTreadon-NOAA Jan 10, 2025
54f1cb7
Merge branch 'develop' into feature/improve_stable_driver
RussTreadon-NOAA Jan 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 18 additions & 23 deletions ci/stable_driver.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ $gdasdir/ush/submodules/update_develop.sh $gdasdir

# ==============================================================================
# email information
PEOPLE="[email protected] Russ.Treadon@noaa.gov [email protected] David.New@noaa.gov"
PEOPLE="[email protected] David.New@noaa.gov Russ.Treadon@noaa.gov"
BODY=$stableroot/$datestr/stable_nightly

# ==============================================================================
Expand All @@ -84,41 +84,36 @@ total=0
if [ $ci_status -eq 0 ]; then
cd $gdasdir
# checkout feature/stable-nightly
git stash
total=$(($total+$?))
if [ $total -ne 0 ]; then
echo "Unable to git stash" >> $stableroot/$datestr/output
fi
git checkout feature/stable-nightly
total=$(($total+$?))
if [ $total -ne 0 ]; then
rc=$?
total=$(($total+$rc))
if [ $rc -ne 0 ]; then
echo "Unable to checkout feature/stable-nightly" >> $stableroot/$datestr/output
fi
# merge in develop
git merge develop
total=$(($total+$?))
if [ $total -ne 0 ]; then
rc=$?
total=$(($total+$rc))
if [ $rc -ne 0 ]; then
echo "Unable to merge develop" >> $stableroot/$datestr/output
fi
# add in submodules
git stash pop
total=$(($total+$?))
if [ $total -ne 0 ]; then
echo "Unable to git stash pop" >> $stableroot/$datestr/output
fi
$my_dir/../ush/submodules/add_submodules.sh $gdasdir
total=$(($total+$?))
if [ $total -ne 0 ]; then
$gdasdir/ush/submodules/add_submodules.sh $gdasdir
rc=$?
total=$(($total+$rc))
if [ $rc -ne 0 ]; then
echo "Unable to add updated submodules to commit" >> $stableroot/$datestr/output
fi
git diff-index --quiet HEAD || git commit -m "Update to new stable build on $datestr"
total=$(($total+$?))
if [ $total -ne 0 ]; then
rc=$?
total=$(($total+$rc))
if [ $rc -ne 0 ]; then
echo "Unable to commit" >> $stableroot/$datestr/output
fi
git push --set-upstream origin feature/stable-nightly
total=$(($total+$?))
if [ $total -ne 0 ]; then
rc=$?
total=$(($total+$rc))
if [ $rc -ne 0 ]; then
echo "Unable to push" >> $stableroot/$datestr/output
fi
if [ $total -ne 0 ]; then
Expand Down Expand Up @@ -152,4 +147,4 @@ mail -r "Darth Vader - NOAA Affiliate <[email protected]>" -s "$SUBJECT" "$PE

# ==============================================================================
# scrub working directory for older files
find $stableroot/* -maxdepth 1 -mtime +3 -exec rm -rf {} \;
find $stableroot/* -maxdepth 1 -mtime +1 -exec rm -rf {} \;