Skip to content
This repository has been archived by the owner on Feb 20, 2023. It is now read-only.

Let relbot update A-C on trunk #26553

Merged
merged 2 commits into from
Aug 22, 2022

Conversation

jcristau
Copy link
Contributor

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

  • Tests: This PR includes thorough tests or an explanation of why it does not
  • Screenshots: This PR includes screenshots or GIFs of the changes made or an explanation of why it does not
  • Accessibility: The code in this PR follows accessibility best practices or does not include any user facing features. In addition, it includes a screenshot of a successful accessibility scan to ensure no new defects are added to the product.

QA

  • QA Needed

To download an APK when reviewing a PR (after all CI tasks finished running):

  1. Click on Checks at the top of the PR page.
  2. Click on the firefoxci-taskcluster group on the left to expand all tasks.
  3. Click on the build-debug task.
  4. Click on View task in Taskcluster in the new DETAILS section.
  5. The APK links should be on the right side of the screen, named for each CPU architecture.

GitHub Automation

Used by GitHub Actions.

@rvandermeulen
Copy link
Contributor

😍

@mergify
Copy link
Contributor

mergify bot commented Aug 19, 2022

This pull request has conflicts when rebasing. Could you fix it @jcristau? 🙏

@jcristau jcristau marked this pull request as ready for review August 22, 2022 08:54
@jcristau jcristau requested review from a team as code owners August 22, 2022 08:54
@jcristau jcristau requested review from escapewindow and JohanLorenzo and removed request for a team August 22, 2022 08:54
Copy link
Contributor

@JohanLorenzo JohanLorenzo left a 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:

fenix/.mergify.yml

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:

- base~=^releases[_/].*

- base~=^releases[_/].*

@jcristau
Copy link
Contributor Author

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.

Good catch, thank you!

@jcristau jcristau requested a review from a team as a code owner August 22, 2022 15:29
@jcristau jcristau added the pr:needs-landing PRs that are ready to land [Will be merged by Mergify] label Aug 22, 2022
We already use relbot for this on fenix release branches and on all
branches for focus-android, so might as well avoid the duplication.
@jcristau jcristau merged commit 6d7ecb5 into mozilla-mobile:main Aug 22, 2022
@jcristau
Copy link
Contributor Author

merged manually due to the mergify config change.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
pr:needs-landing PRs that are ready to land [Will be merged by Mergify]
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants