kamp/fdroidserver
1
0
Fork 0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-10-02 09:10:11 +02:00
Code Activity

Merge branch 'fix_open_mr' into 'master'

Browse Source 
Don't open second MR for gradle (Closes: #914)

Closes #914

See merge request fdroid/fdroidserver!1066
This commit is contained in:
Hans-Christoph Steiner 2021-12-30 18:35:06 +00:00
commit 3720afbe5b
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fdroidserver/apksigcopier.py
View File

@ -59,6 +59,7 @@ import zipfile
import zlib import zlib
from collections import namedtuple from collections import namedtuple
from typing import Dict, Tuple, Union
__version__ = "0.4.0" __version__ = "0.4.0"
NAME = "apksigcopier" NAME = "apksigcopier"
@ -95,7 +96,7 @@ class ZipError(APKSigCopierError):
class ReproducibleZipInfo(zipfile.ZipInfo): class ReproducibleZipInfo(zipfile.ZipInfo):
"""Reproducible ZipInfo hack.""" """Reproducible ZipInfo hack."""
_override = {} _override = {} # type: Dict[str, Union[int, Tuple[int, ...]]]
def __init__(self, zinfo, **override): def __init__(self, zinfo, **override):
if override: if override:

23
tests/gradle-release-checksums.py
View File

@ -127,13 +127,16 @@ if git_repo.is_dirty() and ('gradlew-fdroid' in modified or 'makebuildserver' in
'\n\n<p><small>generated by <a href="%s/-/jobs/%s">GitLab CI Job #%s</a></small></p>' '\n\n<p><small>generated by <a href="%s/-/jobs/%s">GitLab CI Job #%s</a></small></p>'
% (os.getenv('CI_PROJECT_URL'), os.getenv('CI_JOB_ID'), os.getenv('CI_JOB_ID')) % (os.getenv('CI_PROJECT_URL'), os.getenv('CI_JOB_ID'), os.getenv('CI_JOB_ID'))
) )
mr = project.mergerequests.create({ try:
'source_branch': branch.name, mr = project.mergerequests.create({
'target_project_id': 36527, # fdroid/fdroidserver 'source_branch': branch.name,
'target_branch': 'master', 'target_project_id': 36527, # fdroid/fdroidserver
'title': 'update to gradle v' + version, 'target_branch': 'master',
'description': description, 'title': 'update to gradle v' + version,
'labels': ['fdroid-bot', 'gradle'], 'description': description,
'remove_source_branch': True, 'labels': ['fdroid-bot', 'gradle'],
}) 'remove_source_branch': True,
mr.save() })
mr.save()
except gitlab.exceptions.GitlabCreateError as e:
print(e.error_message)