Lubuntu/ci-tooling
8
0
Fork 0
mirror of https://github.com/lubuntu-team/ci-tooling.git synced 2025-02-24 08:41:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

If we can't just push it after a fast-forward merge, something is wrong. Don't assume it's all fine.

Browse Source
This commit is contained in:
Simon Quigley 2020-04-23 04:21:23 -05:00
parent c310fd6ced
commit a8aec7fc37
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
templates/merger.xml
View File

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