Lubuntu/ci-tooling
8
0
Fork 0
mirror of https://github.com/lubuntu-team/ci-tooling.git synced 2025-05-04 14:11:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Simon Quigley 2019-03-30 22:00:40 -05:00
parent 7d3aa8f9ae
commit 2b178685a0
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
templates/merger.xml
View File

@ -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>