1651025 - Convert FirefoxReality from master to main branch

Status: RESOLVED FIXED

(Localization Infrastructure and Tools :: Administration / Setup, task)

Description

[Axel Hecht [:Pike]]

FirefoxReality wants to switch development from master to main.

Between FxR and android-l10n, the following process should work.

1. Add "main" to branches in https://github.com/MozillaReality/FirefoxReality/blob/9a0715bed67aea2b9cbcbf92606a3cfee750aab4/l10n.toml#L28, after "master".
2. Push that to master and main.
3. Have android-l10n pick up that change. Reviews on Pike and Delphine.
4. Switch master to main in config.toml, https://github.com/mozilla-l10n/android-l10n/blob/6ffe029ae02aba07851d5b05f5cd57439d4a9dd7/config.toml#L19.
5. Drop "master" from l10n.toml in FxR, push to main.
6. Have android-l10n pick up that change. Reviews on Pike and Delphine.

Risks:

We haven't tested the multi-branch feature of android-l10n-tooling, but it's covered by tests.

Open Questions:

Do we need to change anything in .taskcluster.yml or taskcluster or ci-configuration or the like?

https://github.com/mozilla-l10n/android-l10n-tooling/blob/da9eb9b558c2bbe7aa3452a6eb5bfa6f97858a3b/taskcluster/ci/config.yml#L54 I guess? TBH, I haven't found out what default-ref actually does :-/

Also, what do we need to monitor along the way?

Comment 1

[Axel Hecht [:Pike]]

Callek, can you have a look at the releng parts?

Comment 2

[Justin Wood (:Callek)]

I figured I'll start to take a stab at the steps here. So starting with step1:

https://github.com/MozillaReality/FirefoxReality/pull/3739 (main branch)
https://github.com/MozillaReality/FirefoxReality/pull/3740 (master branch)

Comment 3

[Justin Wood (:Callek)]

So our step 2 above got done

Step 3 had issues, (https://github.com/mozilla-l10n/android-l10n/pull/250/files) since it didn't pick up main correctly.

Pike filed a PR about this at https://github.com/mozilla-l10n/android-l10n-tooling/pull/26

Comment 4

[Axel Hecht [:Pike]]

Step 3 is now done. Given there were no string changes, I went ahead w/out a review by Delphine.

Step 4 is in https://github.com/mozilla-l10n/android-l10n/pull/251.

Comment 5

[Axel Hecht [:Pike]]

Step 4 is now done, we had to change quite a bit to get the pr targets working.
https://github.com/mozilla-mobile/android-components/pull/7937 is a-c, continues to work against master
https://github.com/MozillaReality/FirefoxReality/pull/3749 is FxR, now creating PRs for main

Comment 6

[Axel Hecht [:Pike]]

https://github.com/mozilla-l10n/android-l10n-tooling/pull/26 and https://github.com/mozilla-l10n/android-l10n-tooling/pull/27 were the code changes needed.

Comment 7

[Axel Hecht [:Pike]]

Step 5 was https://github.com/MozillaReality/FirefoxReality/pull/3753.
The final PR with Step 6 was https://github.com/mozilla-l10n/android-l10n/pull/254.

All is merged, thanks for the help and patience.