mirror of
https://gitlab.com/fdroid/fdroidserver.git
synced 2024-10-03 17:50:11 +02:00
Merge branch 'fix_open_mr' into 'master'
Don't open second MR for gradle (Closes: #914) Closes #914 See merge request fdroid/fdroidserver!1066
This commit is contained in:
commit
3720afbe5b
@ -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:
|
||||||
|
@ -127,6 +127,7 @@ 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'))
|
||||||
)
|
)
|
||||||
|
try:
|
||||||
mr = project.mergerequests.create({
|
mr = project.mergerequests.create({
|
||||||
'source_branch': branch.name,
|
'source_branch': branch.name,
|
||||||
'target_project_id': 36527, # fdroid/fdroidserver
|
'target_project_id': 36527, # fdroid/fdroidserver
|
||||||
@ -137,3 +138,5 @@ if git_repo.is_dirty() and ('gradlew-fdroid' in modified or 'makebuildserver' in
|
|||||||
'remove_source_branch': True,
|
'remove_source_branch': True,
|
||||||
})
|
})
|
||||||
mr.save()
|
mr.save()
|
||||||
|
except gitlab.exceptions.GitlabCreateError as e:
|
||||||
|
print(e.error_message)
|
||||||
|
Loading…
Reference in New Issue
Block a user