From c0b10e6474e0f5d1ac0c261d4b170e7135853da7 Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Fri, 27 Jan 2012 16:08:02 +0100 Subject: [PATCH] include BUILD_NUMBER and git commit id in development version numbers --- debian_build.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/debian_build.py b/debian_build.py index a995833..211d143 100755 --- a/debian_build.py +++ b/debian_build.py @@ -350,18 +350,20 @@ if __name__ == '__main__': DPUT_OPTIONS = DPUT_OPTIONS_DEFAULT if options.distribution in ('testing', 'staging', 'unstable', 'pre-staging','experimental') or GIT_BRANCH_NAME.startswith('release/') or GIT_BRANCH_NAME.startswith('hotfix/'): - daily_date = datetime.datetime.now().strftime('%Y%m%d%H%M%S') + daily_date = datetime.datetime.now().strftime('%Y%m%d') + + current_commit = git_helper.git_get_commit_id() if GIT_BRANCH_NAME.startswith('release/') or GIT_BRANCH_NAME.startswith('hotfix/'): - version = '%s~rc%s' %(version, daily_date) + version = '%s~rc%s+%s+%s' %(version, daily_date, BUILD_NUMBER, current_commit) elif GIT_BRANCH_NAME.startswith('feature/') or GIT_BRANCH_NAME.startswith('poc/') or GIT_BRANCH_NAME.startswith('bugfix/') or options.distribution == 'experimental': - version = '%s~alpha%s' %(version, daily_date) + version = '%s~experimental%s+%s+%s' %(version, daily_date, BUILD_NUMBER, current_commit) # these uploads should go to a different repo: DPUT_OPTIONS = DPUT_OPTIONS_DEV else: - version = '%s~develop%s' %(version, daily_date) + version = '%s~develop%s+%s+%s' %(version, daily_date, BUILD_NUMBER, current_commit) - new_log = 'Generated by jenkins build of %s' % git_helper.git_get_commit_id() + new_log = 'Generated by jenkins build of %s' % current_commit if GIT_BRANCH_NAME == 'experimental' or GIT_BRANCH_NAME.startswith('feature/') or GIT_BRANCH_NAME.startswith('poc/') or GIT_BRANCH_NAME.startswith('bugfix/'): changelog_distro ='dev-'+ GIT_BRANCH_NAME.replace("/","-") -- 2.39.5