Commit Graph

27 Commits (fork)

Author SHA1 Message Date
akliuxingyuan 6ec7bb2bf6 Merge branch 'fenix/108.1.1' into fork 1 year ago
Julien Cristau aa7e56d036
Update mergify queue conditions to account for update-nimbus-experiments PRs (#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.
1 year ago
Adam Novak 7dcbf8c542 Do all of Iceraven in one commit
Bump top site limit under its new name

Fix unresilved conflict

Allow Nimbus to generate code that allows the fork flavors

Drop private browsing page again

Use the new text color name

Point at paged style again

Bring back Sentry so we don't have to change the code that would call it

Note we need to build with app: now for some reason

Also prefix Github build commands

Adapt to settings moving

Parse Iceraven versions

Discover the linter's formatter

Get rid of some Detekt complaints

Handle more weird version strings

Finish README

Stop auto-release changelogs from being too huge

Fix #440 by reattaching settings
2 years ago
Julien Cristau ba611e848e
mergify: allow complete-push check as an alternative to complete-pr in queue conditions (#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.
2 years ago
Julien Cristau 6bee719969 mergify: auto-merge relbot PRs that target the main branch 2 years ago
Julien Cristau 6d7ecb5dbb
Let relbot update A-C on trunk (#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
2 years ago
Julien Cristau 1750240bc6 mergify: squash l10n PRs
One commit per locale is quite noisy; a single commit per update also
matches what happens on desktop.
2 years ago
Johan Lorenzo 8722993e79 Bug 1780740 - part 4: Make the MickeyMoz rule handle A-C updates for both main and release branches 2 years ago
Johan Lorenzo 615735877e Bug 1780740 - part 3: Remove Mergify release automation rules because they will be combined with the MickeyMoz one 2 years ago
Johan Lorenzo e6a99f19d2 Bug 1780740 - part 2: Don't automatically approve a bump if any other files than AndroidComponents.kt are changed 2 years ago
Johan Lorenzo 04691431bd 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 2 years ago
Johan Lorenzo 8f01fb0473 Bug 1779797 - part 6: Do automatically approve a merge request if any other files than L10n ones are changed 2 years ago
Johan Lorenzo 35abbc56a3 Bug 1779797 - part 5: Only auto-approve l10n bumps if they come from the right branches 2 years ago
Johan Lorenzo 96692de82c Bug 1779797 - part 3: Create complete-push taskcluster task 2 years ago
Johan Lorenzo 46f69bc35a Bug 1779797 - Let mergify automatically approve l10n bumps on release branches 2 years ago
Sebastian Kaspari c62aa8bf24 Closes #22198: Mergify: Replace deprecated "strict mode" merge action 2 years ago
Ben Hearsum 95a0b34d8f Backout mergify changes for bustage 3 years ago
Ben Hearsum (he/him) a769052ccb
Don't rebase GeckoView, Android-Components version bump or l10n bump PRs before landing (#20729) 3 years ago
Sebastian Kaspari 8a33d56dfa Mergify: Add rules for landing PRs 3 years ago
Sebastian Kaspari 8c51e06965 Add l10n.toml to list of auto-merge files. 3 years ago
Stefan Arentz a4e5553d85
Update Mergify to also expect ui-test-x86-beta to succeed (#17126) 3 years ago
Stefan Arentz 258f1abc45
Update mergify to recognize old and new task graphs for release builds (#17121) 3 years ago
Stefan Arentz ca36ffe061
Let Mergify know about the change of branch name (#17119) 3 years ago
Stefan Arentz afc8c26e31
Update mergify to use new release branch name format (#17107) 3 years ago
Sebastian Kaspari 1c3fee6169 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.
3 years ago
Stefan Arentz 2e87b640a9
Change the expected author for automated PRs to MickeyMoz (#17048) 3 years ago
Sebastian Kaspari 302bd45f8f
Add initial mergify configuration 3 years ago