Conservancy/website
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixup! Fix git merge during schedule update

Browse source
This commit is contained in:
Ben Sturmfels 2023-09-14 18:34:53 +10:00
parent d8019a11eb
commit 38dec75ddd
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
systemd/conservancy-www-update.sh
View file

@ -24,13 +24,13 @@ fi
IFS=/ read git_remote git_refspec <<EOF
$git_upstream
EOF
git fetch --quiet --no-tags "${git_remote}/${git_refspec}"
git fetch --quiet --no-tags "$git_remote" "$git_refspec"
if [ "$(git rev-parse "$PRODUCTION_BRANCH")" = "$(git rev-parse "$git_upstream")" ]; then
exit 0
fi
exitcode=0
git merge --quiet --ff-only "$git_remote" "$git_refspec"
git merge --quiet --ff-only "${git_remote}/${git_refspec}"
python3 -m compileall -q -x - www || exitcode=$?
chgrp -R www-data www || exitcode=$?
chmod -R g+rX-w,o+X-w www || exitcode=$?