Skip to content

Commit

Permalink
🚚 Squash merge Weblate PRs (#5274)
Browse files Browse the repository at this point in the history
We used to regular-merge Weblate PRs, which leads to a giant history of Weblate commits in the commit history, making it hard to find functional changes.

We weren't able to squash-merge Weblate PRs because it would easily lead to merge conflicts.

Now that we control when Weblate pulls and creates commits, this problem has disappeared, so we can safely squash-merge and get a nicer history.
  • Loading branch information
rix0rrr authored Mar 18, 2024
1 parent 179c723 commit 6d0a524
Showing 1 changed file with 1 addition and 19 deletions.
20 changes: 1 addition & 19 deletions .mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,13 @@ queue_rules:
- "check-success=build"

pull_request_rules:
- name: Automatic squash merge on approval for non-Weblate PRs
- name: Automatic squash merge on approval
conditions:
- and:
- "#approved-reviews-by>=1"
- "#changes-requested-reviews-by=0"
- "check-success=build"
- "check-success=cypress"
- "-author=weblate"
actions:
comment:
message: Thank you for contributing! Your pull request is now going on the merge train (choo choo! Do not click update from main anymore, and be sure to [allow changes to be pushed to your fork](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/allowing-changes-to-a-pull-request-branch-created-from-a-fork)).
Expand All @@ -24,20 +23,3 @@ pull_request_rules:
{{ title }} (#{{number}})
{{ body }}
- name: Automatic regular merge for Weblate PRs
conditions:
- and:
- "#approved-reviews-by>=1"
- "#changes-requested-reviews-by=0"
- "check-success=build"
- "check-success=cypress"
- "author=weblate"
actions:
comment:
message: Thanks Weblate! This pull request is going to be merged automatically.
queue:
name: default_queue
method: merge
commit_message_template: |-
{{ title }} (#{{number}})
{{ body }}

0 comments on commit 6d0a524

Please sign in to comment.