|
|
@ -58,10 +58,10 @@ cd {{ NAME }}
|
|
|
|
git checkout {{ DEFAULT_BRANCH }}
|
|
|
|
git checkout {{ DEFAULT_BRANCH }}
|
|
|
|
git checkout -b {{ PACKAGING_BRANCH_S }} || git checkout {{ PACKAGING_BRANCH_S }}
|
|
|
|
git checkout -b {{ PACKAGING_BRANCH_S }} || git checkout {{ PACKAGING_BRANCH_S }}
|
|
|
|
git merge --ff-only {{ DEFAULT_BRANCH }}
|
|
|
|
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 checkout -b {{ PACKAGING_BRANCH_U }} || git checkout {{ PACKAGING_BRANCH_U }}
|
|
|
|
git merge --ff-only {{ PACKAGING_BRANCH_S }}
|
|
|
|
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>
|
|
|
|
</command>
|
|
|
|
</hudson.tasks.Shell>
|
|
|
|
</hudson.tasks.Shell>
|
|
|
|
</builders>
|
|
|
|
</builders>
|
|
|
|