-
Notifications
You must be signed in to change notification settings - Fork 1.3k
Conversation
😍 |
This pull request has conflicts when rebasing. Could you fix it @jcristau? 🙏 |
7f4512c
to
0368459
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm glad to see we're converging towards a single way of bumping A-C. Before merging this PR, there are a few things we need to change in .mergify.yml
. If we don't, we will break the autoapproval added in #26148.
If I'm not mistaken, it should be a matter of removing these lines:
Lines 52 to 58 in 1750240
- or: | |
- and: | |
- author=mozilla-l10n-automation-bot | |
- base=main | |
- head=import-l10n | |
- status-success=complete-pr | |
- and: |
and then updating these 2 regexes to take main
into account:
Line 8 in 1750240
- base~=^releases[_/].* |
Line 60 in 1750240
- base~=^releases[_/].* |
Good catch, thank you! |
We already use relbot for this on fenix release branches and on all branches for focus-android, so might as well avoid the duplication.
0c930c0
to
69c9669
Compare
69c9669
to
2760b1d
Compare
merged manually due to the mergify config change. |
We already use relbot for this on fenix release branches and on all
branches for focus-android, so might as well avoid the duplication.
Pull Request checklist
QA
To download an APK when reviewing a PR (after all CI tasks finished running):
Checks
at the top of the PR page.firefoxci-taskcluster
group on the left to expand all tasks.build-debug
task.View task in Taskcluster
in the newDETAILS
section.GitHub Automation
Used by GitHub Actions.