diff --git a/runbot_merge/data/merge_cron.xml b/runbot_merge/data/merge_cron.xml index aa9de63e..a728acc5 100644 --- a/runbot_merge/data/merge_cron.xml +++ b/runbot_merge/data/merge_cron.xml @@ -38,7 +38,7 @@ code model._send() 10 - minutes + hours -1 70 diff --git a/runbot_merge/models/pull_requests.py b/runbot_merge/models/pull_requests.py index 6d1ca7f5..2c97c21a 100644 --- a/runbot_merge/models/pull_requests.py +++ b/runbot_merge/models/pull_requests.py @@ -1758,6 +1758,8 @@ class Tagging(models.Model): values['tags_remove'] = json.dumps(list(values['tags_remove'])) if not isinstance(values.get('tags_add', ''), str): values['tags_add'] = json.dumps(list(values['tags_add'])) + if values: + self.env.ref('runbot_merge.labels_cron')._trigger() return super().create(values) def _send(self): diff --git a/runbot_merge/tests/test_by_branch.py b/runbot_merge/tests/test_by_branch.py index 9134a4e2..4d64ca43 100644 --- a/runbot_merge/tests/test_by_branch.py +++ b/runbot_merge/tests/test_by_branch.py @@ -149,7 +149,6 @@ def test_pseudo_version_tag(env, project, make_repo, setreviewers, config): with repo: repo.post_status('staging.master', 'success', 'ci') env.run_crons() # should merge staging - env.run_crons('runbot_merge.labels_cron') # update labels assert pr_id.state == 'merged' assert pr.labels >= {'2.1'} @@ -170,6 +169,5 @@ def test_pseudo_version_tag(env, project, make_repo, setreviewers, config): with repo: repo.post_status('staging.master', 'success', 'ci') env.run_crons() # should merge staging - env.run_crons('runbot_merge.labels_cron') # update labels assert pr_id.state == 'merged' assert pr.labels >= {'post-bonk'}