hi,
I want to build Debian packages with git-buildpackage and learned a lot the
last days, to manage Debian sources with Git.
My project has three branches:
master -> project sources
debian -> all debian/ related files
release -> merge from master and debian
So my actual workflow is:
1. Do some work on the sources (git checkout master ... git commit)
2. Edit debian/changelog ... and other debian files (git checkout
debian ... git commit )
3. git checkout release && git merge debian master
4. git-buildpackage -uc -us --git-tag --git-ignore-new
--git-ignore-branch --git-tag --git-cleaner='git clean -dfx' (which uses
the debian/changelog file to add the tags)
my gbp.conf:
[DEFAULT]
upstream-branch = master
debian-branch = release
[git-buildpackage]
export-dir = ../build-area/
tarball-dir = ../tarballs/
upstream-branch = master
debian-branch = release
sign-tags = False
upstream-tag = v%(version)s
[import-orig]
# Filter out unwanted files/dirs from upstream
filter = [
'*egg.info',
'.bzr',
'.hg',
'.hgtags',
'.svn',
'CVS',
'*/debian/*',
'debian/*'
]
filter-pristine-tar = True
[git-import-dsc]
filter = [
'CVS',
'.cvsignore',
'.hg',
'.hgignore',
'.bzr',
'.bzrignore',
'.gitignore'
]
[git-dch]
# ignore merge commit messages
git-log = --no-merges
So, now I want to integrate the merge and build parts into Jenkins. There
exists a lot of very old HOWTOS for Jenkins and Debian and also some for
merging one branch into master ... but how should I configure the merges
from master and debian, in the branch "release" ?
cu denny
--
You received this message because you are subscribed to the Google Groups
"Jenkins Users" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
To view this discussion on the web visit
https://groups.google.com/d/msgid/jenkinsci-users/27bad604-f7dc-49c2-bb96-00e372b38a86%40googlegroups.com.
For more options, visit https://groups.google.com/d/optout.
