mirror of
https://github.com/f-droid/fdroidserver.git
synced 2025-09-13 22:42:29 +03:00
checkupdates: mark as Draft when only changing Current Version
https://gitlab.com/fdroid/fdroidserver/-/merge_requests/1551#note_2190155816
This commit is contained in:
parent
c97503b5f3
commit
fd15ac9276
1 changed files with 26 additions and 8 deletions
|
@ -766,6 +766,31 @@ def push_commits(remote_name='origin', branch_name='checkupdates', verbose=False
|
||||||
branch_name = m.group(1) # appid
|
branch_name = m.group(1) # appid
|
||||||
if not files:
|
if not files:
|
||||||
return
|
return
|
||||||
|
|
||||||
|
git_repo.create_head(branch_name, force=True)
|
||||||
|
push_options = [
|
||||||
|
'merge_request.create',
|
||||||
|
'merge_request.remove_source_branch',
|
||||||
|
'merge_request.title=bot: ' + git_repo.branches[branch_name].commit.summary,
|
||||||
|
'merge_request.description='
|
||||||
|
+ '~%s checkupdates-bot run %s' % (branch_name, os.getenv('CI_JOB_URL')),
|
||||||
|
]
|
||||||
|
|
||||||
|
# mark as draft if there are only changes to CurrentVersion:
|
||||||
|
current_version_only = True
|
||||||
|
for m in re.findall(
|
||||||
|
r"^[+-].*",
|
||||||
|
git_repo.git.diff(f"upstream/{upstream_main}...HEAD"),
|
||||||
|
flags=re.MULTILINE,
|
||||||
|
):
|
||||||
|
if re.match(r"^(\+\+\+|---) ", m):
|
||||||
|
continue
|
||||||
|
if not re.match(r"^[-+]CurrentVersion", m):
|
||||||
|
current_version_only = False
|
||||||
|
break
|
||||||
|
if current_version_only:
|
||||||
|
push_options.append('merge_request.draft')
|
||||||
|
|
||||||
progress = None
|
progress = None
|
||||||
if verbose:
|
if verbose:
|
||||||
import clint.textui
|
import clint.textui
|
||||||
|
@ -779,20 +804,13 @@ def push_commits(remote_name='origin', branch_name='checkupdates', verbose=False
|
||||||
|
|
||||||
progress = MyProgressPrinter()
|
progress = MyProgressPrinter()
|
||||||
|
|
||||||
git_repo.create_head(branch_name, force=True)
|
|
||||||
remote = git_repo.remotes[remote_name]
|
remote = git_repo.remotes[remote_name]
|
||||||
pushinfos = remote.push(
|
pushinfos = remote.push(
|
||||||
branch_name,
|
branch_name,
|
||||||
progress=progress,
|
progress=progress,
|
||||||
force=True,
|
force=True,
|
||||||
set_upstream=True,
|
set_upstream=True,
|
||||||
push_option=[
|
push_option=push_options,
|
||||||
'merge_request.create',
|
|
||||||
'merge_request.remove_source_branch',
|
|
||||||
'merge_request.title=bot: ' + git_repo.branches[branch_name].commit.summary,
|
|
||||||
'merge_request.description='
|
|
||||||
+ '~%s checkupdates-bot run %s' % (branch_name, os.getenv('CI_JOB_URL')),
|
|
||||||
],
|
|
||||||
)
|
)
|
||||||
|
|
||||||
for pushinfo in pushinfos:
|
for pushinfo in pushinfos:
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue