Safely handle not being able to push; if we've made it this far, it should pass anyway.

master
Simon Quigley 6 years ago
parent 7d3aa8f9ae
commit 2b178685a0

@ -55,7 +55,7 @@ cd {{ NAME }}
git checkout {{ DEFAULT_BRANCH }} git checkout {{ DEFAULT_BRANCH }}
git checkout -b {{ PACKAGING_BRANCH }} || git checkout {{ PACKAGING_BRANCH }} git checkout -b {{ PACKAGING_BRANCH }} || git checkout {{ PACKAGING_BRANCH }}
git merge --ff-only {{ DEFAULT_BRANCH }} git merge --ff-only {{ DEFAULT_BRANCH }}
git push --set-upstream origin {{ PACKAGING_BRANCH }} git push --set-upstream origin {{ PACKAGING_BRANCH }} || echo "cannot push"
</command> </command>
</hudson.tasks.Shell> </hudson.tasks.Shell>
</builders> </builders>

Loading…
Cancel
Save