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

Create CI branches if they don't already exist.

Browse Source
This commit is contained in:
Simon Quigley 2019-03-30 16:39:34 -05:00
parent 61466cbda4
commit 7d3aa8f9ae
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

@ -53,9 +53,9 @@
<command> <command>
cd {{ NAME }} cd {{ NAME }}
git checkout {{ DEFAULT_BRANCH }} git checkout {{ DEFAULT_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 origin {{ PACKAGING_BRANCH }} git push --set-upstream origin {{ PACKAGING_BRANCH }}
</command> </command>
</hudson.tasks.Shell> </hudson.tasks.Shell>
</builders> </builders>