Closed Bug 1196373 Opened 4 years ago Closed 4 years ago

Beta version is missing from about:support and about Firefox

Categories

(Firefox for Android :: General, defect)

defect
Not set

Tracking

()

RESOLVED FIXED
Firefox 43
Tracking Status
firefox41 --- wontfix
firefox42 --- verified
firefox43 --- fixed

People

(Reporter: Sylvestre, Assigned: Sylvestre)

References

Details

Attachments

(1 file, 1 obsolete file)

This is working with Desktop and the buildbot config seems correct.
http://hg.mozilla.org/build/buildbot-configs/file/a7dc6208111b/mozilla/release-fennec-mozilla-beta.py

Not sure what is wrong.
Attached patch android-version.diff (obsolete) — Splinter Review
Here is what was missing.

If I understand correctly http://hg.mozilla.org/build/buildbot-configs/file/a7dc6208111b/mozilla/release-fennec-mozilla-beta.py#l40, this file is also going to be updated the releng tools.
Attachment #8659855 - Flags: review?(mh+mozilla)
Assignee: nobody → sledru
Nick, do you confirm that release-fennec-mozilla-beta.py will do the job?

Anyway, I rebuilt it and run it in an emulator and I confirm that the patch fixes the issue.
Flags: needinfo?(nthomas)
Comment on attachment 8659855 [details] [diff] [review]
android-version.diff

Review of attachment 8659855 [details] [diff] [review]:
-----------------------------------------------------------------

::: mobile/android/confvars.sh
@@ +5,5 @@
>  MOZ_APP_BASENAME=Fennec
>  MOZ_APP_VENDOR=Mozilla
>  
>  MOZ_APP_VERSION=43.0a1
> +MOZ_APP_VERSION_DISPLAY=43.0a1

MOZ_APP_VERSION_DISPLAY defaults to MOZ_APP_VERSION when not given, so setting it to the same value is not doing anything useful. That said, I have no idea what the mentioned script does to this file, so...
Attachment #8659855 - Flags: review?(mh+mozilla)
In the objdir for the 41.0b10 api-9 build I grepped and found this:

config/autoconf.mk:MOZ_APP_VERSION = 41.0
config/autoconf.mk:MOZ_APP_VERSION_DISPLAY = 41.0

AIUI we want 41.0b10 there, like http://hg.mozilla.org/releases/mozilla-beta/rev/a1b015d51b73. aka the bumping is happening, but I'd guess browser/ isn't being read when we do an android build.
Flags: needinfo?(nthomas)
Which makes me think... why isn't mobile/android/confvars.sh just using the same as browser/confvars.sh?

  MOZ_APP_VERSION=$FIREFOX_VERSION
  MOZ_APP_VERSION_DISPLAY=$FIREFOX_VERSION_DISPLAY
Right, this patch should be much better.
Attachment #8659855 - Attachment is obsolete: true
Attachment #8661131 - Flags: review?(mh+mozilla)
Comment on attachment 8661131 [details] [diff] [review]
android-beta-version.diff

Review of attachment 8661131 [details] [diff] [review]:
-----------------------------------------------------------------

::: mobile/android/confvars.sh
@@ +4,5 @@
>  
>  MOZ_APP_BASENAME=Fennec
>  MOZ_APP_VENDOR=Mozilla
>  
> +

unnecessary empty line.
Attachment #8661131 - Flags: review?(mh+mozilla) → review+
rail, jlund - this probably has implications for the migration script.
(In reply to Nick Thomas [:nthomas] from comment #8)
> rail, jlund - this probably has implications for the migration script.

Is there anything that we need to bump during next merges? The patch actually removes a hardcoded value.
I think we'd no longer need to bump MOZ_APP_VERSION in mobile/android/confvars.sh, but would need to bump browser/config/{version,version_display}.txt. We need to finish that up in bug 1175331.
Comment on attachment 8661131 [details] [diff] [review]
android-beta-version.diff

Approval Request Comment
[Feature/regressing bug #]: bug 1145175 (trying to get beta version displayed into the product)
[User impact if declined]: No beta version displayed (no big deal but this helps some users)
[Describe test coverage new/current, TreeHerder]: Local build
[Risks and why]: Low. Worst case scenario: the about window/about:support won't show any version.
[String/UUID change made/needed]: none
Attachment #8661131 - Flags: approval-mozilla-aurora?
https://hg.mozilla.org/mozilla-central/rev/72fde1ca508a
https://hg.mozilla.org/mozilla-central/rev/b2b73523df54
Status: NEW → RESOLVED
Closed: 4 years ago
Resolution: --- → FIXED
Target Milestone: --- → Firefox 43
Comment on attachment 8661131 [details] [diff] [review]
android-beta-version.diff

Approved for uplift to aurora!
Attachment #8661131 - Flags: approval-mozilla-aurora? → approval-mozilla-aurora+
Comment on attachment 8661131 [details] [diff] [review]
android-beta-version.diff

[Triage Comment]
For some reasons, this was not uplifted to aurora, updating the flags.
Attachment #8661131 - Flags: approval-mozilla-aurora+ → approval-mozilla-beta+
Looks like the landing went a little wrong
http://hg.mozilla.org/releases/mozilla-beta/rev/11b976840f0f

The file contains this now:
     5 MOZ_APP_BASENAME=Fennec
     6 MOZ_APP_VENDOR=Mozilla
     7 
     8 +MOZ_APP_VERSION=$FIREFOX_VERSION
     9 +MOZ_APP_VERSION_DISPLAY=$FIREFOX_VERSION_DISPLAY
    10 MOZ_APP_UA_NAME=Firefox
(In reply to Nick Thomas [:nthomas] from comment #18)
> Looks like the landing went a little wrong
> http://hg.mozilla.org/releases/mozilla-beta/rev/11b976840f0f
> 
> The file contains this now:
>      5 MOZ_APP_BASENAME=Fennec
>      6 MOZ_APP_VENDOR=Mozilla
>      7 
>      8 +MOZ_APP_VERSION=$FIREFOX_VERSION
>      9 +MOZ_APP_VERSION_DISPLAY=$FIREFOX_VERSION_DISPLAY
>     10 MOZ_APP_UA_NAME=Firefox

D'oh... Sorry about that... My bad merging a failed patch... :/
42.0b1 Version is displayed in about:support in Firefox 42 Beta 1.
Verified as fixed in Firefox 42 Beta 1.
Device Asus Transformer Pad (Android 4.2.1).
You need to log in before you can comment on or make changes to this bug.