summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSolomon Peachy <pizza@shaftnet.org>2020-06-20 15:39:25 -0400
committerSolomon Peachy <pizza@shaftnet.org>2020-06-20 15:39:25 -0400
commit9405e28b291503c92d50de2e0ad54367c14689b5 (patch)
tree6331968daef73be7067b757180a5b1db771880c3
parent62fab9a9a1f44e9e995197a14196c6429785cd90 (diff)
downloadwww-9405e28b291503c92d50de2e0ad54367c14689b5.tar.gz
www-9405e28b291503c92d50de2e0ad54367c14689b5.zip
buildmaster: Run data dir cleanup *after* we update git repo
(as it uses the git repo to determine what to clean up)
-rwxr-xr-xbuildserver/hooks/roundcomplete.sh5
1 files changed, 4 insertions, 1 deletions
diff --git a/buildserver/hooks/roundcomplete.sh b/buildserver/hooks/roundcomplete.sh
index bc73cf8..c8c0185 100755
--- a/buildserver/hooks/roundcomplete.sh
+++ b/buildserver/hooks/roundcomplete.sh
@@ -23,7 +23,6 @@ else
perl showsize.pl > sizes.html.new && mv sizes.html.new sizes.html
perl devbuilds.pl > devbuilds.html.new && mv devbuilds.html.new devbuilds.html
# perl mktitlepics.pl
- perl cleanupdatadir.pl
# make build-info for rbutil
echo "[bleeding]" > build-info.new
@@ -36,10 +35,14 @@ else
# udpate local git repo
(cd ../../rockbox_git_clone && git pull -q --stat )
+ # Cleanup. Must happen AFTER git update
+ perl cleanupdatadir.pl
+
# Mark themesite and translate as needing to be updated
# see $HOME/update_site.sh for details
touch ../../translate/need_update
touch ../../themes/need_update
+
fi
rm data/build_running