1548655 - Figure out Fennec version numbering as different channels ride the trains to ESR

Status: RESOLVED FIXED

(Firefox for Android Graveyard :: General, task)

Description

[Ryan VanderMeulen [:RyanVM]]

As Gecko 68 rides the trains from mozilla-central to eventually ESR68, we will be simultaneously shipping multiple channels from the same repo. However, at this point in time, they will all share the same display version number as specified in config/milestone.txt.

Ideally, we would continue using a scheme consistent with current practice:

• Nightly builds 68.Xa1 (i.e. 68.0a1, 68.1a1, etc)
• Beta builds 68.XbN (i.e. 68.0b1, 68.1b1, 68.1b2, etc)
• Release builds 68.X (i.e. 68.0, 68.1, 68.1.2, etc)

Currently, on ESR60, config/milestone.txt stores a plain version number (60.6.2 at the moment).

Given that we now have a FENNEC_NIGHTLY define at our disposal which could easily be extended to include a FENNEC_BETA one as well, could we just add a bit of logic to init.configure which appends the a1 or bN to the app version to create the app display version? The only part I'm not sure about is where we'd keep track of the Beta number to use.

Comment 1

[Ryan VanderMeulen [:RyanVM]]

mozilla-beta also stores a plain version number in config/milestone.txt

Comment 2

[Mike Hommey [:glandium]]

If you create both mobile/android/config/version.txt and mobile/android/config/version_display.txt, you can use whatever version you want... except you can't deal with different versions on the same branch.

Comment 3

[Ryan VanderMeulen [:RyanVM]]

Discussing further with glandium on IRC, the suggestion is to enable passing a custom path to version.txt & version_display.txt which can be specified at the mozconfig level. That would then allow us to control all of this at the mozconfig level and with the merge day automation we already have.

Comment 4

[Ryan VanderMeulen [:RyanVM]]

I have working patches for comment 3 🤘

Comment 5

[Ryan VanderMeulen [:RyanVM]]

Attachment: Bug 1548655 - Specify custom version file paths for Fennec builds.

Comment 6

[Ryan VanderMeulen [:RyanVM]]

This patch depends on bug 1548916 but works both locally and on Try. Johan, please include this in any future Try pushes of yours.

Comment 7

[Johan Lorenzo [:jlorenzo]]

It's great to have dedicated version config files. If we go this way, I must change these configuration on the version-bump-fennec task[1] to stop modifying the version config files used by Desktop and just keep the new mobile ones. The worker must also be updated in order to allow it[2]

[1] https://searchfox.org/mozilla-central/rev/b2015fdd464f598d645342614593d4ebda922d95/taskcluster/ci/release-version-bump/kind.yml#63
[2] https://github.com/mozilla-releng/treescript/blob/5a3ca4b71564a2497084a86009b13466752aeef8/treescript/versionmanip.py#L16-L22

Comment 8

[Ryan VanderMeulen [:RyanVM]]

Johan's most recent Try push with this patch included shows test_interfaces.html failures. The reason is that the test manually parses the version number to decide if it's a Nightly build or not (instead of using AppConstants), so it's getting confused about the Nightly-but-not-really-Nightly status of the builds.

Funny enough, I'd actually filed bug 1313741 at one point about changing those checks to just use AppConstants. Guess I'll pick that back up.

Comment 9

[Ryan VanderMeulen [:RyanVM]]

Landed on Beta. Note that we are NOT landing this on m-c so that this change will only exist on 68 as it rides the trains.
https://hg.mozilla.org/releases/mozilla-beta/rev/cf273dce0debb09b0556f9023d16242c8f7e9b7c