Commit d57a1f64 authored by anarcat's avatar anarcat

adapt autobuild version to 2.x versionning

parent 6e29b0ec
......@@ -27,22 +27,14 @@ KEY?="-kjenkins@$(DOMAIN)"
jenkins-build-official:
git-buildpackage -b --git-upstream-branch=origin/upstream --git-debian-branch=origin/debian --git-ignore-branch -kjenkins@ci.aegirproject.org
# the upstream version: strip the 6.x and turn the appendix into
# +N.foo where N is the number of commits since last tag and foo is
# the hash
upstream_version=$(shell git describe --tags origin/6.x-2.x | sed 's/6.x-//;s/-\([0-9]*\)-\([^-]*\)$$/+\1.\2/')
# the debian version, strip the debian/ part of the tag and the
# upstream version number, keep just the debian part, replacing as
# above for the N.foo part
debian_version=$(shell git describe --tags origin/debian | sed "s/debian\///;s/-\([0-9]*\)-\([^-]*\)$$/+\1.\2/;s/^.*-//" )
version=2.0~$(shell git log -n 1 --oneline | sed 's/ .*$$//')
# this builds a debian package but first updates the branches to follow the latest 2.x branch
# this assumes you are on a "debian" branch (of course)
jenkins-build-auto:
git merge origin/6.x-2.x
dch -D unstable -v ${upstream_version}-${debian_version} "automatic jenkins build ${BUILD_TAG}"
dch -D unstable -v ${version} "automatic jenkins build ${BUILD_TAG}"
git commit -m"dummy commit for jenkins ${BUILD_TAG} autobuild" debian/changelog
git-buildpackage -b --git-upstream-branch=origin/6.x-2.x ${KEY}
git-buildpackage -b ${KEY}
show-version:
@echo ${upstream_version}-${debian_version}
@echo ${version}
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