diff --git a/ci/jobgenerator.py b/ci/jobgenerator.py index 2ff08a3..66e0d17 100755 --- a/ci/jobgenerator.py +++ b/ci/jobgenerator.py @@ -139,13 +139,15 @@ class Generator: url = package["packaging_url"] branch = package["packaging_branch"] upstream = package["upstream_url"] + upload_target = package["upload_target"] # TODO: This is just a dummy command to run in order to test # the config updating package_config = template.render(PACKAGING_URL=url, PACKAGING_BRANCH=branch, UPSTREAM_URL=upstream, NAME=package["name"], - RELEASE=release) + RELEASE=release, + UPLOAD_TARGET=upload_target) if job_name in jobs: job = server.get_job(job_name) job.update_config(package_config) diff --git a/templates/packagebuild.xml b/templates/packagebuild.xml index f862fb4..932f0a7 100644 --- a/templates/packagebuild.xml +++ b/templates/packagebuild.xml @@ -45,8 +45,9 @@ mv -v debian {{ NAME }}; git clone {{ UPSTREAM_URL }} upstream; export VERSION="$(head -1 {{ NAME }}/debian/changelog | sed -n '/(/,/)/{:a; $!N; /)/!{$!ba}; s/.*(\([^)]*\)).*/\1/p}' | cut -d '-' -f1)+git$(date +'%Y%m%d%H%M')"; sed -i "1i{{ NAME }} ($VERSION-0ubuntu1~ppa1) {{ RELEASE }}; urgency=low\n\n * CI upload.\n\n –– Lugito <info@lubuntu.me> $(date +'%a, %d %b %Y %T %z')\n" {{ NAME }}/debian/changelog; -cat {{ NAME }}/debian/changelog; -gpg --list-keys +tar cvf {{ NAME }}_$VERSION.orig.tar; +gzip {{ NAME }}_$VERSION.orig.tar; +(cd {{ NAME }}; debuild -S -d -sa; dput {{ UPLOAD_TARGET }} ../{{ NAME }}_$VERSION-0ubuntu1~ppa1_source.changes)