From 4519bdb40920bdec5d2d09084da52e37ea4d570d Mon Sep 17 00:00:00 2001 From: Lars Wirzenius Date: Sun, 9 Sep 2018 18:46:05 +0300 Subject: Change: use ick_helpers.py in CI builds (not just release builds) --- pipelines/debian.ick | 43 ++++++++++--------------------------------- 1 file changed, 10 insertions(+), 33 deletions(-) diff --git a/pipelines/debian.ick b/pipelines/debian.ick index 7d0e41b..0e62ae4 100644 --- a/pipelines/debian.ick +++ b/pipelines/debian.ick @@ -106,40 +106,17 @@ pipelines: - sources - distribution_ci actions: - - python: | - import os - sources = params['sources'] - distribution = params['distribution_ci'] - for source in sources: - dirname = source['location'] - control = os.path.join(dirname, 'debian', 'control') - print('looking for', control) - if os.path.exists(control): - print('building in', dirname) - src = OUT('dpkg-parsechangelog', '-S', 'Source', cwd=dirname) - src = src.strip() - print('src', repr(src)) - assert src - - ver = OUT('dpkg-parsechangelog', '-S', 'Version', cwd=dirname) - print('ver', repr(ver)) - assert ver - - if '-' in ver: - parts = ver.split('-') - ver = '-'.join(parts[:-1]) - ver += '.0ci{}'.format(os.environ['BUILD_NUMBER']) - print('ver', repr(ver)) - - tarball = '../{}_{}.orig.tar.xz'.format(src, ver) - print('tarball', repr(tarball)) - - RUN('dch', '-v', '{}-1'.format(ver), '--distribution', distribution, - '--force-distribution', 'CI build', cwd=dirname) - RUN('dch', '-r', '', cwd=dirname) - RUN('sh', '-c', 'git archive HEAD | xz > {}'.format(tarball), cwd=dirname) - RUN('dpkg-buildpackage', '-us', '-uc', cwd=dirname) + - where: container + shell: | + rm -rf ick-helpers + git clone git://git.liw.fi/ick-helpers + + - python: | + import sys + sys.path.insert(0, '/workspace/ick-helpers') + import ick_helpers + ick_helpers.ci_build_debian(params) where: container # Upload all *.changes files at the root of the workspace. -- cgit v1.2.1