1157289 - Use different icon for locally built Firefox vs. official Nightly

Status: RESOLVED FIXED

(Firefox :: General, defect)

Description

[J. Ryan Stinnett [:jryans] (Use needinfo, replies may be slow)]

I frequently run two Nightlies:

1. An official Nightly build I use for regular browsing
2. A locally built Nightly to test whatever feature I am building

These currently use the same application icon, and I waste a sad amount of time each day switching to the wrong application and getting confused when both are open.

It would be nice if we could alter the icon of locally built Nightlies in some way.  For the browser toolbox, we added a small "play / pause" annotation to that process in bug 1091260, which is quite helpful for that case.  We could do the same here, but this type of change is Mac only.  At least it gets you something quick without requiring asset changes.

Comment 1

[J. Ryan Stinnett [:jryans] (Use needinfo, replies may be slow)]

Mike, is there a good configure flag or similar to distinguish "locally built Nightly" from "official Nightly built by Mozilla"?

My instinct is to use MOZ_UPDATE_CHANNEL == "default", but I feel like I've seen you say that's bad in the past.

Comment 2

[Mike Hommey [:glandium]]

Local builds are already *not* using the same logo:

This is what you should get for nightlies:
https://mxr.mozilla.org/mozilla-central/source/browser/branding/nightly/mozicon128.png

This is what you should get for local builds:
https://mxr.mozilla.org/mozilla-central/source/browser/branding/unofficial/mozicon128.png

Sure, the difference is subtle, but there already is one. So you /could/ make a case to change the unofficial branding images, but there's nothing to do on the build system's end.

Comment 3

[:Gijs (he/him)]

Stephen, can we get more differentiation between these two icons (see comment #2), please? :-)

Comment 4

[J. Ryan Stinnett [:jryans] (Use needinfo, replies may be slow)]

(In reply to Mike Hommey [:glandium] from comment #2)
> Local builds are already *not* using the same logo:
> 
> This is what you should get for nightlies:
> https://mxr.mozilla.org/mozilla-central/source/browser/branding/nightly/
> mozicon128.png
> 
> This is what you should get for local builds:
> https://mxr.mozilla.org/mozilla-central/source/browser/branding/unofficial/
> mozicon128.png
> 
> Sure, the difference is subtle, but there already is one. So you /could/
> make a case to change the unofficial branding images, but there's nothing to
> do on the build system's end.

Oh wow, that's an impressively subtle distinction!  Well, thanks for the info.  Hopefully UX can make it the distinction more obvious for us.

Comment 5

[J. Ryan Stinnett [:jryans] (Use needinfo, replies may be slow)]

(In reply to Mike Hommey [:glandium] from comment #2)
> Local builds are already *not* using the same logo:
> 
> This is what you should get for nightlies:
> https://mxr.mozilla.org/mozilla-central/source/browser/branding/nightly/
> mozicon128.png
> 
> This is what you should get for local builds:
> https://mxr.mozilla.org/mozilla-central/source/browser/branding/unofficial/
> mozicon128.png
> 
> Sure, the difference is subtle, but there already is one. So you /could/
> make a case to change the unofficial branding images, but there's nothing to
> do on the build system's end.

Actually, on my local Mac builds at least, it does not seems like browser/branding/unofficial is actually used.  I really do get the nightly branding.  MOZ_BRANDING_DIRECTORY remains set to nightly from browser/confvars.sh[1] when I check the variables in config.status for local builds.

I noticed that b2g does use unofficial in confvars.sh.  Mike, does this mean browser/confvars.sh is not set up correctly here?

[1]: https://dxr.mozilla.org/mozilla-central/source/browser/confvars.sh#50

Comment 6

[Stephen Horlander [:shorlander]]

(In reply to :Gijs Kruitbosch from comment #3)
> Stephen, can we get more differentiation between these two icons (see
> comment #2), please? :-)

I don't have the time to look into this at the moment. If some other visually inclined designer does I can help point to the right files to update.

Comment 7

[Anthony Lam (:antlam) Find me, @antlam on Slack!]

As I'm not mobile-focused, I'd defer to Mike and Bryan!

Comment 8

[Anthony Lam (:antlam) Find me, @antlam on Slack!]

*I AM mobile-focused

Comment 9

[Mike Hommey [:glandium]]

(In reply to J. Ryan Stinnett [:jryans] from comment #5)
> I noticed that b2g does use unofficial in confvars.sh.  Mike, does this mean
> browser/confvars.sh is not set up correctly here?
> 
> [1]: https://dxr.mozilla.org/mozilla-central/source/browser/confvars.sh#50

It would seem so.

Comment 10

[J. Ryan Stinnett [:jryans] (Use needinfo, replies may be slow)]

Attachment: MozReview Request: bz://1157289/jryans

/r/7559 - Bug 1157289 - Use unoffical branding for local Firefox builds. r=Gijs,glandium

Pull down this commit:

hg pull -r 3f2dbbfe9e0af0c54f856b908b2a72a3f7151ccb https://reviewboard-hg.mozilla.org/gecko/

Comment 11

[J. Ryan Stinnett [:jryans] (Use needinfo, replies may be slow)]

I did a build-only push: https://treeherder.mozilla.org/#/jobs?repo=try&revision=3e8a756e2745

Is there other coverage that would be good to run as well?  Wasn't sure.

Comment 12

[Mike Hommey [:glandium]]

Comment on attachment 8596857 [details]
MozReview Request: bz://1157289/jryans

https://reviewboard.mozilla.org/r/7557/#review6359

::: CLOBBER:25
(Diff revision 1)
> -Bug 1155718: Merge Bluetooth v1/v2 files for all simple cases
> +Bug 1157289: Use unofficial branding for local Firefox builds

This shouldn't be needed, because confvars.sh is a dependency of config.status. IOW, any change to confvars.sh should retrigger configure, and that should be enough.

::: browser/config/mozconfigs/linux32/nightly:14
(Diff revision 1)
> +ac_add_options --with-branding=browser/branding/nightly

This should also be added to at least the debug mozconfigs. I guess it's fine not to add it to asan builds.

Comment 13

[Mike Hommey [:glandium]]

Comment on attachment 8596857 [details]
MozReview Request: bz://1157289/jryans

I think this should be reviewed by gavin as well.

Comment 14

[:Gijs (he/him)]

Comment on attachment 8596857 [details]
MozReview Request: bz://1157289/jryans

https://reviewboard.mozilla.org/r/7557/#review6361

Please request the next review from :glandium.

This does make me wonder why we don't have a shared "nightly" mozconfig, because updating something like 12 files seems excessive.

::: browser/confvars.sh:50
(Diff revision 1)
> -MOZ_BRANDING_DIRECTORY=browser/branding/nightly
> +MOZ_BRANDING_DIRECTORY=browser/branding/unofficial

Looks like the comment above this should be updated.

Comment 15

[J. Ryan Stinnett [:jryans] (Use needinfo, replies may be slow)]

Comment on attachment 8596857 [details]
MozReview Request: bz://1157289/jryans

/r/7559 - Bug 1157289 - Use unoffical branding for local Firefox builds. r=gavin,glandium

Pull down this commit:

hg pull -r 589a1e2f929e6e0ae359e22560bb6dcf55ace5f7 https://reviewboard-hg.mozilla.org/gecko/

Comment 16

[J. Ryan Stinnett [:jryans] (Use needinfo, replies may be slow)]

While updating the comment, I noticed bug 659568, which essentially wants to make the same change.  But it seems like it got blocked on a bunch of name discussions.

The unofficial directory seems to use "Mozilla Developer Preview" as the brand*Name today.  Hopefully that's fine?

Try: https://treeherder.mozilla.org/#/jobs?repo=try&revision=eb47a2a83844

Comment 17

[:Gijs (he/him)]

(In reply to J. Ryan Stinnett [:jryans] (use ni?) from comment #16)
> While updating the comment, I noticed bug 659568, which essentially wants to
> make the same change.  But it seems like it got blocked on a bunch of name
> discussions.
> 
> The unofficial directory seems to use "Mozilla Developer Preview" as the
> brand*Name today.  Hopefully that's fine?
> 
> Try: https://treeherder.mozilla.org/#/jobs?repo=try&revision=eb47a2a83844

Maybe we can keep the name the same as whatever it is now and update just the icon for the time being? We can file a followup bug to bikeshed about name changes (which might also be useful to distinguish the two!).

Comment 18

[Mike Hommey [:glandium]]

Comment on attachment 8596857 [details]
MozReview Request: bz://1157289/jryans

https://reviewboard.mozilla.org/r/7557/#review6621

Ship It!

Comment 19

[J. Ryan Stinnett [:jryans] (Use needinfo, replies may be slow)]

(In reply to :Gijs Kruitbosch (away until May 5th) from comment #17)
> (In reply to J. Ryan Stinnett [:jryans] (use ni?) from comment #16)
> > While updating the comment, I noticed bug 659568, which essentially wants to
> > make the same change.  But it seems like it got blocked on a bunch of name
> > discussions.
> > 
> > The unofficial directory seems to use "Mozilla Developer Preview" as the
> > brand*Name today.  Hopefully that's fine?
> > 
> > Try: https://treeherder.mozilla.org/#/jobs?repo=try&revision=eb47a2a83844
> 
> Maybe we can keep the name the same as whatever it is now and update just
> the icon for the time being? We can file a followup bug to bikeshed about
> name changes (which might also be useful to distinguish the two!).

Sure, I'd be fine with that.  For now, I'll wait to hear Gavin's decision on whether this is a good idea or not.

Comment 20

[J. Ryan Stinnett [:jryans] (Use needinfo, replies may be slow)]

Gijs, is there anyone else who can make the official decision on whether this is okay or not?  Gavin hasn't replied.

Comment 21

[:Gijs (he/him)]

I'm sorry this lingered.

As we're changing this code to do what it was intended to do from the beginning (use unofficial instead of nightly branding), I don't think you need anything more than an r+ from a peer. I am happy to give you an rs=me seeing as you already have a build peer review the requisite actual build shenanigans. If I am not official enough, maybe ask 1 other person, say, ttaubert, and then declare quorum and ask for forgiveness later if people show up being surprised/upset by the change? :-)

Comment 22

[Tim Taubert [:ttaubert] (inactive)]

rs=me as well.

Comment 23

[J. Ryan Stinnett [:jryans] (Use needinfo, replies may be slow)]

Try: https://treeherder.mozilla.org/#/jobs?repo=try&revision=e26549cc9dfb

Comment 24

[J. Ryan Stinnett [:jryans] (Use needinfo, replies may be slow)]

Attachment: MozReview Request: Bug 1157289 - Use unoffical branding for local Firefox builds. r=glandium rs=Gijs,ttaubert

Bug 1157289 - Use unoffical branding for local Firefox builds. r=glandium rs=Gijs,ttaubert

Comment 25

[J. Ryan Stinnett [:jryans] (Use needinfo, replies may be slow)]

Attachment: MozReview Request: Bug 1157289 - Unofficial branding with labels from Nightly. r=Gijs

Bug 1157289 - Unofficial branding with labels from Nightly. r=Gijs

Comment 26

[J. Ryan Stinnett [:jryans] (Use needinfo, replies may be slow)]

(In reply to J. Ryan Stinnett [:jryans] (use ni?) from comment #25)
> Created attachment 8612090 [details]
> MozReview Request: Bug 1157289 - Unofficial branding with labels from
> Nightly. r=Gijs
> 
> Bug 1157289 - Unofficial branding with labels from Nightly. r=Gijs

Gijs, this additional patch implements my understanding of what you mentioned in comment 17: unofficial now uses the same strings as Nightly, so only the graphics are different.

Comment 27

[:Gijs (he/him)]

Comment on attachment 8612090 [details]
MozReview Request: Bug 1157289 - Unofficial branding with labels from Nightly. r=Gijs

https://reviewboard.mozilla.org/r/9529/#review8305

Ship It!

Comment 28

[Pulsebot]

https://hg.mozilla.org/integration/fx-team/rev/85a1327ba4e3
https://hg.mozilla.org/integration/fx-team/rev/0e430c8b3373

Comment 29

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/mozilla-central/rev/85a1327ba4e3
https://hg.mozilla.org/mozilla-central/rev/0e430c8b3373