1822491 - firefox-android: Mergify doesn't rebase PRs anymore

Status: RESOLVED WORKSFORME

(Release Engineering :: General, defect, P1)

Description

[Johan Lorenzo [:jlorenzo]]

Original issue in Github[1]:

Expected Behavior

Github users can use a Github label to get their PR embarked on a merge train.

Actual Behavior

Here's the error message we currently get:

This pull request cannot be embarked for merge
The merge queue pull request can't be updated
Details:

Unable to update: user MozillaNoah is unknown.

Please make sure MozillaNoah has logged in Mergify dashboard.

Source: https://github.com/mozilla-mobile/firefox-android/pull/1217/checks?check_run_id=11997595835

Steps to Reproduce the Problem

1. Have a user part of our Github organization mark a PR ready to embark on a merge train

2. Wait for CI to complete

3. When CI is ready, PR gets the error message above ⬆️

I'm not 100% sure but this looks like a recent regression. No one on the team has ever got this problem.

cc @rvandermeulen

Specifications

* Pull Request URLs:
  
  * [Bug 1814994 - Create Tabs Tray list and grid layouts mozilla-mobile/firefox-android#1217](https://github.com/mozilla-mobile/firefox-android/pull/1217)
  * [Bug 1807268 - Disable toggleSearchBookmarksAndHistoryTest UI test mozilla-mobile/firefox-android#1234](https://github.com/mozilla-mobile/firefox-android/pull/1234)
  * we had to manually rebase the following:
    
    * [Bug 1821715 - Update OnboardingPageState to include button actions mozilla-mobile/firefox-android#1204](https://github.com/mozilla-mobile/firefox-android/pull/1204)
    * [Bug 1822198 - use relbot 6.0.0 mozilla-mobile/firefox-android#1232](https://github.com/mozilla-mobile/firefox-android/pull/1232)
  * this one did work though [Bug 1822244 - remove ac-create-release workflow mozilla-mobile/firefox-android#1228](https://github.com/mozilla-mobile/firefox-android/pull/1228)

* Mergify Config URL: https://github.com/mozilla-mobile/firefox-android/blob/2d0ce92593ecb04e24397c3947d1c8862c76041f/.mergify.yml

Mergify responded the exiting behavior was deprecated[2]:

Rebasing pull requests with a random user is deprecated

When a bot_account is required to rebase/squash/update a pull request and the configuration option is not set, Mergify no longer falls back to a random organization user. It uses the author of the pull request instead.

For the queue action, public repositories accepting pull requests from users outside their organization must set a update_bot_account or update_method: merge.

[1] https://github.com/Mergifyio/mergify/issues/5075
[2] https://changelog.mergify.com/changelog/rebasing-pull-requests-with-a-random-user-is-deprecated

Comment 1

[Johan Lorenzo [:jlorenzo]]

Issue was fixed a week or two after being filed. Mergify now automatically rebases PRs. For instance:

• firefox-android#2853
• firefox-android#2917