We should be able to remove several of the differences in confvars.sh across nightly, aurora, beta, and release with the configure changes in bug 817723. This will lessen the merge work when merging the branches.
If we go with bug 817723 then we could do this as well to simplify merging.
Ran this and bug 817723 through try https://tbpl.mozilla.org/?tree=Try&rev=f4db189551e9&noignore=1
Comment on attachment 688535 [details] [diff] [review] patch rev1 With the changes to configure.in from bug 817723 we should be able to simplify the merges for release management by removing the one-off handling in confvars.sh
Comment on attachment 688535 [details] [diff] [review] patch rev1 Brian, just want to make sure that you see no problems with this approach
Attachment #688535 - Flags: feedback?(netzen)
Comment on attachment 688535 [details] [diff] [review] patch rev1 Review of attachment 688535 [details] [diff] [review]: ----------------------------------------------------------------- The only thing I can think of is that I think RelEng or QA use some different release channels for testing individual repos. Like beta-test or something similar to that. In that case, the beta-test release channel would get this wrong information: ACCEPTED_MAR_CHANNEL_IDS=firefox-mozilla-central MAR_CHANNEL_ID=firefox-mozilla-central Instead of what it should get: ACCEPTED_MAR_CHANNEL_IDS=firefox-mozilla-beta,firefox-mozilla-release MAR_CHANNEL_ID=firefox-mozilla-beta
I believe that is already handled in the patch since the channel change is done manually and the beta confvars are already set to that http://mxr.mozilla.org/mozilla-beta/source/browser/confvars.sh Release confvars.sh for reference http://mxr.mozilla.org/mozilla-release/source/browser/confvars.sh I'll ask for feedback from nthomas as well just in case
7 years ago
Attachment #688535 - Flags: feedback?(netzen) → feedback?(nthomas)
OK thanks, everything else looks good, that's the only thing I'm not sure about.
7 years ago
Attachment #688535 - Attachment description: patch rev1 - requires patch from bug 817723 → patch rev1
Note: this patch removes all of the requirements to edit to confvars for desktop on: https://wiki.mozilla.org/Release_Management/Merge_Documentation
Comment on attachment 688535 [details] [diff] [review] patch rev1 >+MOZ_OFFICIAL_BRANDING_DIRECTORY=browser/branding/official >+if test "$MOZ_UPDATE_CHANNEL" = "release" -o \ >+ "$MOZ_UPDATE_CHANNEL" = "beta" -o \ >+ "$MOZ_UPDATE_CHANNEL" = "esr"; then >+ MOZ_BRANDING_DIRECTORY=browser/branding/nightly >+elif test "$MOZ_UPDATE_CHANNEL" = "aurora"; then >+ MOZ_BRANDING_DIRECTORY=browser/branding/aurora >+else >+ MOZ_BRANDING_DIRECTORY=browser/branding/nightly >+fi Looks like you can collapse this to MOZ_OFFICIAL_BRANDING_DIRECTORY=browser/branding/official if test "$MOZ_UPDATE_CHANNEL" = "aurora"; then MOZ_BRANDING_DIRECTORY=browser/branding/aurora else MOZ_BRANDING_DIRECTORY=browser/branding/nightly fi re channels I agree that betatest and releasetest are used at test-time rather than build-time, so it's not a problem here. We do change at compile time for branches like ux, eg the nightly-ux channel, but that will still work fine with the changes here.
Attachment #688535 - Flags: feedback?(nthomas) → feedback+
Comment on attachment 691255 [details] [diff] [review] patch rev2 - updated to comments Review of attachment 691255 [details] [diff] [review]: ----------------------------------------------------------------- ::: browser/confvars.sh @@ +28,5 @@ > +# separated list of values. > +# The MAR_CHANNEL_ID must not contain the following 3 characters: ",\t " > +if test "$MOZ_UPDATE_CHANNEL" = "release"; then > + ACCEPTED_MAR_CHANNEL_IDS=firefox-mozilla-release > + MAR_CHANNEL_ID=firefox-mozilla-release You could do case "$MOZ_UPDATE_CHANNEL" in release|aurora|esr) ACCEPTED_MAR_CHANNEL_IDS=firefox-mozilla-$MOZ_UPDATE_CHANNEL MAR_CHANNEL_ID=firefox-mozilla-$MOZ_UPDATE_CHANNEL ;; beta) ACCEPTED_MAR_CHANNEL_IDS=firefox-mozilla-beta,firefox-mozilla-release MAR_CHANNEL_ID=firefox-mozilla-beta ;; *) ACCEPTED_MAR_CHANNEL_IDS=firefox-mozilla-central MAR_CHANNEL_ID=firefox-mozilla-central ;; esac
Attachment #691255 - Flags: review?(mh+mozilla) → review+
Carrying forward r+
7 years ago
Summary: Make confvars.sh the same across branches where possible → Make confvars.sh for desktop the same across branches where possible
Pushed to mozilla-inbound https://hg.mozilla.org/integration/mozilla-inbound/rev/3cfc257e29a5
Status: NEW → RESOLVED
Last Resolved: 7 years ago
Resolution: --- → FIXED
Target Milestone: --- → Firefox 20
akeybl, with this on trunk all I am fairly certain that all of the merge instructions for desktop's confvars.sh no longer apply when merging to aurora. I am fine with uplifting this bug (also requires uplifting bug 817723) to aurora as well if you would like to... beta as well.
Comment on attachment 691866 [details] [diff] [review] patch rev3 - updated to comments Would love to also get this on Aurora for the 19 merge to beta! Pre-approving for that branch. Thanks rstrong!!
Pushed to mozilla-aurora https://hg.mozilla.org/releases/mozilla-aurora/rev/fddab01e981f
Turns out that MOZ_UPDATE_CHANNEL isn't defined except for nightly builds so this approach won't work. :( and meh. I'll also back it out of mozilla-central.
Backed out of mozilla-inbound https://hg.mozilla.org/integration/mozilla-inbound/rev/1ac81b33e492 Unassigning for now but I will take it again if I can see a way to accomplish this.
7 years ago
Merge of backout: https://hg.mozilla.org/mozilla-central/rev/1ac81b33e492
triaging, rstrong is this bug still relevant in active development streams or can it be closed?
Component: Build Config → General
Product: Firefox → Firefox Build System
Target Milestone: Firefox 20 → ---
Might as well close it since the process is working well without this.
Status: REOPENED → RESOLVED
Last Resolved: 7 years ago → 6 months ago
Resolution: --- → WONTFIX
You need to log in before you can comment on or make changes to this bug.