1095934 - Aurora builds should not be identified by the update channel

Status: RESOLVED FIXED

(DevTools :: General, defect)

Description

[Panos Astithas (he/him) [:past] (please ni?)]

Identifying Aurora builds by the update channel results in non-nightly builds needing to have the update channel set in .mozconfig. We can do better than that.

Comment 1

[Panos Astithas (he/him) [:past] (please ni?)]

Attachment: Don't use the update channel to identify aurora

I've been told that I should do this before, but it got forgotten in all the #fx10 craze.

Comment 2

[Panos Astithas (he/him) [:past] (please ni?)]

https://hg.mozilla.org/integration/fx-team/rev/43118280b457

Comment 3

[Carsten Book [:Tomcat]]

https://hg.mozilla.org/mozilla-central/rev/43118280b457

Comment 4

[Panos Astithas (he/him) [:past] (please ni?)]

Comment on attachment 8519462 [details] [diff] [review]
Don't use the update channel to identify aurora

Approval Request Comment
[Feature/regressing bug #]: MOZ_DEV_EDITION was introduced in bug 1024110
[User impact if declined]: local and tinderbox builds from the aurora branch will not have the Developer Edition branding and behavior
[Describe test coverage new/current, TBPL]: m-c
[Risks and why]: trivial configuration change
[String/UUID change made/needed]: none

Comment 5

[Mike Hommey [:glandium]]

Comment on attachment 8519462 [details] [diff] [review]
Don't use the update channel to identify aurora

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

::: configure.in
@@ +9006,5 @@
>      AC_DEFINE_UNQUOTED(ATK_MINOR_VERSION, $ATK_MINOR_VERSION)
>      AC_DEFINE_UNQUOTED(ATK_REV_VERSION, $ATK_REV_VERSION)
>  fi
>  
> +if test -z "$RELEASE_BUILD" -a -z "$NIGHTLY_BUILD"; then

Actually, after having built an aurora iceweasel, let me retract here. This should be test -n "$MOZ_DEV_EDITION", and MOZ_DEV_EDITION should be set in browser/branding/aurora/configure.sh.

Comment 6

[Panos Astithas (he/him) [:past] (please ni?)]

Attachment: Define MOZ_DEV_EDITION in aurora branding configuration

Like this?

Comment 7

[Mike Hommey [:glandium]]

Comment on attachment 8520574 [details] [diff] [review]
Define MOZ_DEV_EDITION in aurora branding configuration

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

Yes (but double check it actually works ;) )

Comment 8

[Panos Astithas (he/him) [:past] (please ni?)]

Yep, I just built locally with only setting --with-branding and I got myself a nice Firefox Developer Edition.

Comment 9

[Panos Astithas (he/him) [:past] (please ni?)]

Comment on attachment 8519462 [details] [diff] [review]
Don't use the update channel to identify aurora

I'll ask for approval on the combined patch.

Comment 10

[Panos Astithas (he/him) [:past] (please ni?)]

https://hg.mozilla.org/integration/fx-team/rev/b9f8b0d3a7d7

Comment 11

[Panos Astithas (he/him) [:past] (please ni?)]

Attachment: Patch fro Aurora

This is the combied patch for Aurora.

Comment 12

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/mozilla-central/rev/b9f8b0d3a7d7

Comment 13

[Panos Astithas (he/him) [:past] (please ni?)]

Comment on attachment 8520640 [details] [diff] [review]
Patch fro Aurora

Approval Request Comment
[Feature/regressing bug #]: MOZ_DEV_EDITION was introduced in bug 1024110
[User impact if declined]: local and tinderbox builds from the aurora branch will not have the Developer Edition branding and behavior
[Describe test coverage new/current, TBPL]: m-c
[Risks and why]: trivial configuration change
[String/UUID change made/needed]: none

Comment 14

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/releases/mozilla-aurora/rev/f82b751275b1

Comment 15

[:Gavin Sharp [email: [e-mail]]]

(In reply to Mike Hommey [:glandium] from comment #5)
> Actually, after having built an aurora iceweasel, let me retract here. This
> should be test -n "$MOZ_DEV_EDITION", and MOZ_DEV_EDITION should be set in
> browser/branding/aurora/configure.sh.

Why? This makes merge logistics more complicated (additional configure.sh change required on uplift). I don't particularly care to support the "easy building non-devedition from Aurora" use case.

Comment 16

[Mike Hommey [:glandium]]

(In reply to :Gavin Sharp [email: [e-mail]] from comment #15)
> (In reply to Mike Hommey [:glandium] from comment #5)
> > Actually, after having built an aurora iceweasel, let me retract here. This
> > should be test -n "$MOZ_DEV_EDITION", and MOZ_DEV_EDITION should be set in
> > browser/branding/aurora/configure.sh.
> 
> Why? This makes merge logistics more complicated (additional configure.sh
> change required on uplift).

Huh? What changes are required to browser/branding/aurora/configure.sh on uplift?

Comment 17

[:Gavin Sharp [email: [e-mail]]]

Sorry, I was confused and thought we were talking about confvars.sh. Nevermind!