2
0
mirror of https://github.com/fork-maintainers/iceraven-browser synced 2024-11-07 15:20:38 +00:00
Commit Graph

26 Commits

Author SHA1 Message Date
Johan Lorenzo
71291e7b8d [fenix] Bug 1808179 - mergify: remove rebase_fallback option from queue action config (https://github.com/mozilla-mobile/fenix/pull/28826) 2023-02-13 17:33:20 +01:00
Julien Cristau
5bf0f43494 [fenix] Update mergify queue conditions to account for update-nimbus-experiments PRs (https://github.com/mozilla-mobile/fenix/pull/27774)
The update-nimbus-experiments workflow creates PRs that don't schedule a
`complete-pr` task (because the github-actions bot is untrusted), but in this
case we have a `complete-push` task which is good enough.
2022-11-14 11:17:40 +01:00
Julien Cristau
307895737f [fenix] mergify: allow complete-push check as an alternative to complete-pr in queue conditions (https://github.com/mozilla-mobile/fenix/pull/26902)
PRs created by github actions don't get a pull-request taskcluster graph
scheduled (because that is only done for PRs created by collaborators).
However, if the PR is created in the main fenix repo, typically because
it comes from one of our internal github workflows, then we get a push
graph, which is sufficient to run the required checks.

This change lets mergify consider a green `complete-push` task as
sufficient to queue a PR (in addition to all the other conditions, e.g.
wrt review), which will allow PRs created by the
update-nimbus-experiments workflow to be queued by mergify instead of
having to be merged by a repo admin.
2022-09-09 18:08:56 +02:00
Julien Cristau
2bfaf93972 [fenix] mergify: auto-merge relbot PRs that target the main branch 2022-08-31 14:50:07 -04:00
Julien Cristau
7672b99ec4 [fenix] Let relbot update A-C on trunk (https://github.com/mozilla-mobile/fenix/pull/26553)
* Let relbot update A-C on trunk

We already use relbot for this on fenix release branches and on all
branches for focus-android, so might as well avoid the duplication.

* Update mergify rules to auto-merge AC bumps from relbot on the main branch
2022-08-22 18:18:49 +02:00
Julien Cristau
1d89346fa9 [fenix] mergify: squash l10n PRs
One commit per locale is quite noisy; a single commit per update also
matches what happens on desktop.
2022-08-22 09:10:34 -04:00
Johan Lorenzo
5d5ce04d2f [fenix] Bug 1780740 - part 4: Make the MickeyMoz rule handle A-C updates for both main and release branches 2022-07-25 13:22:54 +02:00
Johan Lorenzo
bb2c8fae77 [fenix] Bug 1780740 - part 3: Remove Mergify release automation rules because they will be combined with the MickeyMoz one 2022-07-25 13:22:54 +02:00
Johan Lorenzo
e71d696e86 [fenix] Bug 1780740 - part 2: Don't automatically approve a bump if any other files than AndroidComponents.kt are changed 2022-07-25 13:22:54 +02:00
Johan Lorenzo
8e03fe3f34 [fenix] Bug 1780740 - part 1: Don't automerge if Gecko.kt changes since this file was removed in https://github.com/mozilla-mobile/fenix/pull/4297 2022-07-25 13:22:54 +02:00
Johan Lorenzo
de281a716d [fenix] Bug 1779797 - part 6: Do automatically approve a merge request if any other files than L10n ones are changed 2022-07-20 16:44:24 +02:00
Johan Lorenzo
ca6d5f67e9 [fenix] Bug 1779797 - part 5: Only auto-approve l10n bumps if they come from the right branches 2022-07-20 16:44:24 +02:00
Johan Lorenzo
742f49c76a [fenix] Bug 1779797 - part 3: Create complete-push taskcluster task 2022-07-20 16:44:24 +02:00
Johan Lorenzo
9e12ec133c [fenix] Bug 1779797 - Let mergify automatically approve l10n bumps on release branches 2022-07-15 18:43:09 -04:00
Sebastian Kaspari
5858b62587 [fenix] Closes https://github.com/mozilla-mobile/fenix/issues/22198: Mergify: Replace deprecated "strict mode" merge action 2021-11-29 16:14:34 +01:00
Ben Hearsum
dea42546cf [fenix] Backout mergify changes for bustage 2021-08-10 15:37:34 +02:00
Ben Hearsum (he/him)
5aa97150be [fenix] Don't rebase GeckoView, Android-Components version bump or l10n bump PRs before landing (https://github.com/mozilla-mobile/fenix/pull/20729) 2021-08-09 12:40:36 -04:00
Sebastian Kaspari
f586263314 [fenix] Mergify: Add rules for landing PRs 2021-06-21 10:40:19 +02:00
Sebastian Kaspari
49d1c2b9f8 [fenix] Add l10n.toml to list of auto-merge files. 2021-02-22 17:09:53 +02:00
Stefan Arentz
df8e7aa595 [fenix] Update Mergify to also expect ui-test-x86-beta to succeed (https://github.com/mozilla-mobile/fenix/pull/17126) 2021-01-14 15:47:54 +01:00
Stefan Arentz
0aa02edb27 [fenix] Update mergify to recognize old and new task graphs for release builds (https://github.com/mozilla-mobile/fenix/pull/17121) 2020-12-18 10:51:55 -05:00
Stefan Arentz
ed3375682c [fenix] Let Mergify know about the change of branch name (https://github.com/mozilla-mobile/fenix/pull/17119) 2020-12-18 09:50:47 -05:00
Stefan Arentz
67b6479d84 [fenix] Update mergify to use new release branch name format (https://github.com/mozilla-mobile/fenix/pull/17107) 2020-12-17 19:35:54 -05:00
Sebastian Kaspari
369c46d9c1 [fenix] Mergify: List checks manually for relbot PRs
PR tasks/checks do not run for relbot and therefore the existing mergify doesn't work. Instead we can look at the "push tasks". But since there is no "push complete" task yet, I listed all checks manually.
2020-12-16 19:05:03 +01:00
Stefan Arentz
079ffcd1c7 [fenix] Change the expected author for automated PRs to MickeyMoz (https://github.com/mozilla-mobile/fenix/pull/17048) 2020-12-15 12:05:43 -05:00
Sebastian Kaspari
7d7dddcc9c [fenix] Add initial mergify configuration 2020-11-20 13:47:11 +01:00