2023-01-24 16:41:57 +00:00
# Guide to merging contributor PRs for Firefox Android team members
2023-05-18 15:08:06 +00:00
Contributor PRs will run only a specific suite of CI tests (excluding UI tests) in order to protect secrets. Use the following steps when reviewing and merging a contributor PR.
2023-01-24 16:41:57 +00:00
2023-05-18 15:08:06 +00:00
## Process for landing contributor PR
2023-01-24 16:41:57 +00:00
_Note: these instructions use https://cli.github.com/_
2023-05-18 15:08:06 +00:00
1. Fetch upstream changes and locally check out the contributor's branch onto your fork.
2023-01-24 16:41:57 +00:00
```sh
git fetch --all
2023-05-18 15:08:06 +00:00
gh pr checkout < PR number >
2023-01-24 16:41:57 +00:00
# Example:
2023-05-18 15:08:06 +00:00
gh pr checkout 1234 # for https://github.com/mozilla-mobile/firefox-android/pull/1234
2023-01-24 16:41:57 +00:00
```
2023-05-18 15:08:06 +00:00
2. Build and run contributor's changes locally to verify that it works correctly.
2023-01-24 16:41:57 +00:00
2023-05-18 15:08:06 +00:00
3. Review the code to make sure everything is clean.
2023-01-24 16:41:57 +00:00
2023-05-18 15:08:06 +00:00
4. Once a Firefox Android team member has reviewed the PR and deemed it safe, comment the following to start UI tests.
```bors try```
2023-01-24 16:41:57 +00:00
2023-05-18 15:08:06 +00:00
5. Once the UI tests have all completed and passed, approve the PR and add `approved` and `needs landing` label the contributor's PR.
2023-01-24 16:41:57 +00:00
2023-05-18 15:08:06 +00:00
6. Monitor the merging process to make sure it lands as expected.
2023-01-24 16:41:57 +00:00
2023-05-18 15:08:06 +00:00
## Process for updating contributor PR (if contributor needs help or is unresponsive)
2023-01-24 16:41:57 +00:00
2023-05-18 15:08:06 +00:00
```sh
git remote add < Contributor remote name > < Contributor repository >
git checkout < Contributor remote name > /< Contributor branch name >
git rebase upstream/main (or any other actions you want to fixup in their PR)
git push < Contributor remote name > HEAD:< Contributor branch name > -f
```