jepler/wlo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

re-exec the PBR script each time, in case it's changed

Browse source
This commit is contained in:
Sebastian Kuzminsky 2015-11-08 22:14:27 -07:00
parent 14cc1f487a
commit 1780f9fa8d
1 changed files with 39 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
scripts/pull-build-rsync
View file

@ -4,25 +4,48 @@
RSYNC_DEST=emcboard@www.linuxcnc.org:www.linuxcnc.org/new
git fetch -t origin
MASTER_SHA=$(git rev-parse master)
ORIGIN_MASTER_SHA=$(git rev-parse origin/master)
if [ $MASTER_SHA = $ORIGIN_MASTER_SHA ] && [ "$1" != "--force" ]; then
echo "master and origin/master are the same, nothing to do"
echo "run with --force to do it anyway"
exit 0
fi
git reset --hard
git checkout master
git reset --hard origin/master
#
# build the site
#
./scripts/update-version
jekyll build --trace || exit 1
rsync -e 'ssh -i /home/seb/.ssh/wlo' --archive --quiet _site/ $RSYNC_DEST
#
# upload it to wlo
#
rsync -e 'ssh -i /home/seb/.ssh/wlo' --archive --verbose _site/ $RSYNC_DEST
#
# wait for new commits to show up in the git repo
#
while : ; do
git fetch -t origin
MASTER_SHA=$(git rev-parse master)
ORIGIN_MASTER_SHA=$(git rev-parse origin/master)
if [ $MASTER_SHA = $ORIGIN_MASTER_SHA ]; then
echo "$(date +'%F %T') master and origin/master are the same, nothing to do"
sleep 60
else
echo "$(date +'%F %T') new commits in origin/master!"
break
fi
done
#
# new commits are available, and have been fetched into this repo
#
git reset --hard
git checkout master
git reset --hard origin/master
exec scripts/pull-build-rsync