Philipp Hörist pushed to branch master at gajim / gajim
Commits:
436fb0b6 by lovetox at 2022-05-23T21:56:03+02:00
ci: Update debian build script
- - - - -
2 changed files:
- .ci/debian_build.py
- .gitlab-ci.yml
Changes:
=====================================
.ci/debian_build.py
=====================================
@@ -26,19 +26,21 @@
class ReleaseContext:
app: str
pkg_name: str
+ rev: str
release_name: str
release_dir: Path
tarball: Path
@classmethod
- def from_tarball(cls, path: str) -> ReleaseContext:
+ def from_tarball(cls, path: str, prefix: str, rev: str) -> ReleaseContext:
tarball = Path(path)
app = tarball.name.split('-', maxsplit=1)[0]
- pkg_name = f'{app}-nightly'
+ pkg_name = f'{prefix}{app}-nightly'
release_name = f'{pkg_name}_{DATE}'
release_dir = BUILD_DIR / release_name
return cls(app=app,
pkg_name=pkg_name,
+ rev=rev,
release_name=release_name,
release_dir=release_dir,
tarball=tarball)
@@ -69,7 +71,7 @@ def prepare_changelog(context: ReleaseContext) -> None:
log.info('Prepare Changelog')
changelog = context.release_dir / 'debian' / 'changelog'
content = changelog.read_text()
- content = content.replace('{DATE}', DATE)
+ content = content.replace('{DATE}', f'{DATE}-{context.rev}')
content = content.replace('{DATE_TIME}', DATE_TIME)
changelog.write_text(content)
@@ -89,9 +91,14 @@ def build(context: ReleaseContext) -> None:
if __name__ == '__main__':
parser = argparse.ArgumentParser(description='Build debian package')
parser.add_argument('tarball', help='Path to tarball e.g. app.tar.gz')
+ parser.add_argument('rev', help='The package revision e.g. 1')
+ parser.add_argument('--pkgprefix', default='', required=False,
+ help='Prefix for the package name e.g. python3-')
args = parser.parse_args()
- context = ReleaseContext.from_tarball(args.tarball)
+ context = ReleaseContext.from_tarball(args.tarball,
+ args.pkgprefix,
+ args.rev)
clean_build_dir()
prepare_package_dir(context)
=====================================
.gitlab-ci.yml
=====================================
@@ -63,7 +63,7 @@ build-linux:
- if: '$CI_COMMIT_TAG'
script:
- python3 setup.py sdist
- - python3 .ci/debian_build.py "$(find dist/gajim-*)"
+ - python3 .ci/debian_build.py "$(find dist/gajim-*)" 1
artifacts:
name: "gajim-$CI_COMMIT_REF_NAME-$CI_COMMIT_SHA"
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/commit/436fb0b620edb33a8146219ec4bc8569d6c995d8
--
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/commit/436fb0b620edb33a8146219ec4bc8569d6c995d8
You're receiving this email because of your account on dev.gajim.org.
_______________________________________________
Commits mailing list
[email protected]
https://lists.gajim.org/cgi-bin/listinfo/commits
