Commit f58b0932 authored by anarcat's avatar anarcat

try to build auto on a temp branch

parent 79857dff
......@@ -83,12 +83,10 @@ version=$(shell git describe --match 'debian/*' --tags | sed 's/debian\///;s/-\(
# this builds a debian package but first updates the branches to follow the latest 1.x branch
jenkins-build-auto:
git checkout -b upstream || git checkout upstream
git rebase origin/upstream
git checkout -b tmpdebian origin/debian
git merge origin/6.x-1.x
git checkout -b debian || git checkout debian
git rebase origin/debian
git merge upstream
dch -v ${version} "automatic jenkins build"
git commit -m"dummy commit for $version autobuild" debian/changelog
git-buildpackage -b -kjenkins@ci.aegirproject.org
git-buildpackage -b --git-upstream-branch=origin/6.x-1.x --git-debian-branch=tmpdebian -kjenkins@ci.aegirproject.org
git checkout ${GIT_COMMIT}
git branch -D tmpdebian
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment