Philipp Hörist pushed to branch master at gajim / gajim

Commits:

2 changed files:

Changes:

  • .ci/debian_build.py
    ... ... @@ -26,19 +26,21 @@
    26 26
     class ReleaseContext:
    
    27 27
         app: str
    
    28 28
         pkg_name: str
    
    29
    +    rev: str
    
    29 30
         release_name: str
    
    30 31
         release_dir: Path
    
    31 32
         tarball: Path
    
    32 33
     
    
    33 34
         @classmethod
    
    34
    -    def from_tarball(cls, path: str) -> ReleaseContext:
    
    35
    +    def from_tarball(cls, path: str, prefix: str, rev: str) -> ReleaseContext:
    
    35 36
             tarball = Path(path)
    
    36 37
             app = tarball.name.split('-', maxsplit=1)[0]
    
    37
    -        pkg_name = f'{app}-nightly'
    
    38
    +        pkg_name = f'{prefix}{app}-nightly'
    
    38 39
             release_name = f'{pkg_name}_{DATE}'
    
    39 40
             release_dir = BUILD_DIR / release_name
    
    40 41
             return cls(app=app,
    
    41 42
                        pkg_name=pkg_name,
    
    43
    +                   rev=rev,
    
    42 44
                        release_name=release_name,
    
    43 45
                        release_dir=release_dir,
    
    44 46
                        tarball=tarball)
    
    ... ... @@ -69,7 +71,7 @@ def prepare_changelog(context: ReleaseContext) -> None:
    69 71
         log.info('Prepare Changelog')
    
    70 72
         changelog = context.release_dir / 'debian' / 'changelog'
    
    71 73
         content = changelog.read_text()
    
    72
    -    content = content.replace('{DATE}', DATE)
    
    74
    +    content = content.replace('{DATE}', f'{DATE}-{context.rev}')
    
    73 75
         content = content.replace('{DATE_TIME}', DATE_TIME)
    
    74 76
         changelog.write_text(content)
    
    75 77
     
    
    ... ... @@ -89,9 +91,14 @@ def build(context: ReleaseContext) -> None:
    89 91
     if __name__ == '__main__':
    
    90 92
         parser = argparse.ArgumentParser(description='Build debian package')
    
    91 93
         parser.add_argument('tarball', help='Path to tarball e.g. app.tar.gz')
    
    94
    +    parser.add_argument('rev', help='The package revision e.g. 1')
    
    95
    +    parser.add_argument('--pkgprefix', default='', required=False,
    
    96
    +                        help='Prefix for the package name e.g. python3-')
    
    92 97
         args = parser.parse_args()
    
    93 98
     
    
    94
    -    context = ReleaseContext.from_tarball(args.tarball)
    
    99
    +    context = ReleaseContext.from_tarball(args.tarball,
    
    100
    +                                          args.pkgprefix,
    
    101
    +                                          args.rev)
    
    95 102
     
    
    96 103
         clean_build_dir()
    
    97 104
         prepare_package_dir(context)
    

  • .gitlab-ci.yml
    ... ... @@ -63,7 +63,7 @@ build-linux:
    63 63
         - if: '$CI_COMMIT_TAG'
    
    64 64
       script:
    
    65 65
         - python3 setup.py sdist
    
    66
    -    - python3 .ci/debian_build.py "$(find dist/gajim-*)"
    
    66
    +    - python3 .ci/debian_build.py "$(find dist/gajim-*)" 1
    
    67 67
     
    
    68 68
       artifacts:
    
    69 69
         name: "gajim-$CI_COMMIT_REF_NAME-$CI_COMMIT_SHA"