Multiple channels release with different installed locations and user dir #10552

darkdh · 2017-08-17T04:16:51Z

Todo:

Needs new brave_installer.*, background.png, brave_splash_installing.gif for each channels from @bradleyrichter
~~Change package.json for electron-packager, electron-installer-debian, electron-installer-redhat and electron-squirrel-startup once they are merged~~
Change "iconUrl: https://raw.githubusercontent.com/brave/browser-laptop/coexisted-channels/res/${channel}/app.ico, " to master once reviewers apporved

fixes #10189

requires Overrides user-data-dir by exe name on Windows muon#276
requires CrProductDirName overrides on Mac electron-packager#2
- superseded by Redo CrProductDirName overrides on Mac (backward compatible) electron-packager#3
- and Redo Fix filename undefined error in rcedit on Windows (backward comp… electron-packager#4
requires --user-data-dir overrides electron-installer-debian#1
requires --user-data-dir overrides electron-installer-redhat#1
requires Shortcuts user-data-dir overrides on Windows electron-squirrel-startup#2
- superseded by Redo Shortcuts user-data-dir overrides on Windows electron-squirrel-startup#3
requires Make desktop name configurable from browser-laptop muon#309

If 11104 is merged:

@Auditors: @bsclifton, @bridiver, @bbondy, @aekeus

Submitter Checklist:

Submitted a ticket for my issue if one did not already exist.
Used Github auto-closing keywords in the commit message.
Added/updated tests for this change (for new code or code which already has tests).
Ran git rebase -i to squash commits (if needed).
Tagged reviewers and labelled the pull request as needed.

Test Plan:

Reviewer Checklist:

Tests

Adequate test coverage exists to prevent regressions
Tests should be independent and work correctly when run individually or as a suite ref
New files have MPL2 license header

codecov-io · 2017-08-17T04:37:02Z

Codecov Report

Merging #10552 into master will decrease coverage by 0.75%.
The diff coverage is 30%.

@@            Coverage Diff             @@
##           master   #10552      +/-   ##
==========================================
- Coverage   52.74%   51.99%   -0.76%     
==========================================
  Files         269      270       +1     
  Lines       25670    25556     -114     
  Branches     4099     4074      -25     
==========================================
- Hits        13540    13288     -252     
- Misses      12130    12268     +138

Flag	Coverage Δ
#unittest	`51.99% <30%> (-0.76%)`	⬇️

Impacted Files	Coverage Δ
app/locale.js	`35.23% <ø> (ø)`	⬆️
js/stores/appStore.js	`16.03% <0%> (+0.06%)`	⬆️
app/buildConfig.js	`100% <100%> (ø)`
js/constants/appConfig.js	`100% <100%> (ø)`	⬆️
app/channel.js	`50% <14.28%> (-45%)`	⬇️
app/sessionStore.js	`76.16% <50%> (+0.03%)`	⬆️
app/common/state/ledgerState.js	`45.56% <0%> (-12.91%)`	⬇️
app/browser/reducers/spellCheckerReducer.js	`67.44% <0%> (-11.02%)`	⬇️
app/browser/api/ledger.js	`30.83% <0%> (-8.97%)`	⬇️
js/actions/appActions.js	`16.51% <0%> (-1.81%)`	⬇️
... and 13 more

aekeus · 2017-08-18T15:36:44Z

tools/buildInstaller.js

+    appName = 'Brave'
+    break
+  default:
+    throw new Error('CHANNEL environment variable must be set to developer, beta or dev')


This should include nightly as well

aekeus · 2017-08-18T15:37:12Z

tools/buildPackage.js

+
+var channels = { nightly: true, developer: true, beta: true, dev: true }
+if (!channels[channel]) {
+  throw new Error('CHANNEL environment variable must be set to developer, beta or dev')


nightly should be here as well

aekeus · 2017-08-18T15:37:24Z

tools/buildPackage.js

+    appName = 'Brave'
+    break
+  default:
+    throw new Error('CHANNEL environment variable must be set to developer, beta or dev')


nightly should be here

bsclifton · 2017-08-29T16:58:15Z

Besides the Muon PR, we'll also need some new images from @bradleyrichter in order to complete this one

bridiver · 2017-08-29T19:28:01Z

we should really integrate this into b-l-b which also has the brave icons, etc...

bsclifton · 2017-08-29T23:10:44Z

app/windowsInit.js

+const Channel = require('./channel')
+let appUserModelId = 'com.squirrel.brave.Brave'
+switch (Channel.channel()) {
+  case 'nightly':


kind of a lame nit-pick; you could store the text representation of the channels in an enum-like format in channel.js:

const channelStrings = { RELEASE: 'dev', BETA: 'beta', // .. }

and then export / import from this file. Will make updating the constants easier 😄

switch (Channel.channel()) { case Channel.name.NIGHTLY: }

bsclifton · 2017-09-06T18:28:00Z

@darkdh can we get a rebase on this one please? 😄

darkdh · 2017-09-06T19:51:39Z

rebased

luixxiul · 2017-09-07T16:09:17Z

@bradleyrichter would you tell me if the images are ready? #10552 (comment)

bradleyrichter · 2017-09-08T14:42:28Z

These icons are not ready yet but I will create them today.

…

On Sep 7, 2017, at 9:09 AM, Suguru Hirahara ***@***.***> wrote: @bradleyrichter would you tell me if the images are ready? #10552 (comment) — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub, or mute the thread.

bsclifton · 2017-09-08T17:33:17Z

One thing that's a little confusing- if I run the different binaries after building, each of them will ask if I want to make this the default browser. How do Firefox and Chrome handle this? Do their nightly/developer versions still prompt for the default browser setting on launch?

darkdh · 2017-09-08T18:06:30Z

If I turn Always check default browser on Firefox and Firefox Nightly and set default browser to any of two, the other will always ask if you want to set me as default.
This is expected, some users will want to use Nightly as default browser. And different channels should be treated as different browsers

bradleyrichter · 2017-09-08T22:33:29Z

We can disable prompting on non-production builds but keep the functionality.

…

On Sep 8, 2017, at 11:06 AM, Anthony Tseng ***@***.***> wrote: If I turn Always check default browser on Firefox and Firefox Nightly and set default browser to any of two, the other will always ask if you want to set me as default. This is expected, some users will want to use Nightly as default browser. And different channels should be treated as different browsers — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub <#10552 (comment)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/AM4jqvp_ECbmPc3jxUpvNPjFpnjyZ_6mks5sgYIxgaJpZM4O5wrG>.

bsclifton · 2017-09-08T22:41:48Z

@bradleyrichter just to confirm: we'd want to not prompt by default unless the build is in release channel?

@darkdh would it be easy to make this change? 😄

bradleyrichter · 2017-09-08T22:43:20Z

Yes. This would be much less annoying for those who run dual installs.

bsclifton · 2017-09-08T22:53:10Z

tools/buildInstaller.js

+const channel = process.env.CHANNEL
+
+var channels = { nightly: true, developer: true, beta: true, dev: true }
+if (!channels[channel]) {


This could be changed to import the channels directly from app/channel.js.
const channels = require('../app/channel').channels

If that is an Array:
if (!channels.includes(channel)) {

if that is a Set:
if (!channels.has(channel)) {

It seems weird to me to pull dependency from app folder for tools

yeah that's true- maybe it's fine as-is 😄

bsclifton · 2017-09-08T23:02:32Z

tools/buildPackage.js

+
+const channel = env.CHANNEL
+
+var channels = { nightly: true, developer: true, beta: true, dev: true }


same feedback as above

bsclifton

Comments left- looks great 😄 👍 I tested building and launching each type- works as expected

(will give approval once we have icons / dependencies are merged / feedback is addressed if needed)

cezaraugusto · 2017-10-28T03:36:01Z

@darkdh going to close this one for now given its wip for a while. Please re-open as needed. Thanks!

bsclifton · 2017-10-28T07:21:11Z

Re-opening as we'll be revisiting this one soon! I'll remove the WIP tag since the remaining items are called out, I believe

bsclifton · 2017-10-28T07:22:18Z

@darkdh ready for a rebase when you get a chance 😄

darkdh · 2017-10-29T04:00:37Z

rebased

@Auditors

@Auditors: @bsclifton, @bridiver, @bbondy, @aekeus

bsclifton

I have done a great deal of testing with this- everything is working as expected 😄

Great job on this one! We can finally get true beta/nightlies out now

bsclifton · 2017-11-03T21:25:19Z

master c83e123
0.21.x: 47f48f3
0.20.x: cf6a8b5

Multiple channels release with different installed locations and user dir

darkdh added the PR/work-in-progress ⚒ label Aug 17, 2017

darkdh self-assigned this Aug 17, 2017

darkdh requested review from bridiver, aekeus, bbondy and bsclifton August 17, 2017 04:16

aekeus reviewed Aug 18, 2017

View reviewed changes

darkdh force-pushed the coexisted-channels branch from a2bfe1e to 31f714f Compare August 26, 2017 02:27

bsclifton added this to the 0.19.x (Beta Channel) milestone Aug 29, 2017

bsclifton added copy/content/text installation labels Aug 29, 2017

bsclifton reviewed Aug 29, 2017

View reviewed changes

darkdh force-pushed the coexisted-channels branch from 31f714f to 3a87cba Compare September 6, 2017 19:49

bsclifton reviewed Sep 8, 2017

View reviewed changes

bbondy modified the milestones: 0.19.x (Beta Channel), 0.20.x (Developer Channel) Sep 20, 2017

bsclifton mentioned this pull request Sep 21, 2017

Make desktop name configurable from browser-laptop brave/muon#309

Merged

darkdh force-pushed the coexisted-channels branch from 7b7f985 to e48b164 Compare September 25, 2017 06:26

bbondy modified the milestones: 0.20.x (Beta Channel), Backlog Oct 27, 2017

bbondy removed the sprint/1 label Oct 27, 2017

cezaraugusto closed this Oct 28, 2017

bsclifton reopened this Oct 28, 2017

bsclifton added PR/needs-rebase ۞ and removed PR/work-in-progress ⚒ labels Oct 28, 2017

luixxiul added the QA/test-plan-required label Oct 28, 2017

darkdh force-pushed the coexisted-channels branch from e48b164 to 65d19cc Compare October 29, 2017 04:00

darkdh removed the PR/needs-rebase ۞ label Oct 29, 2017

bsclifton mentioned this pull request Oct 30, 2017

Provide a more seamless way to upgrade Brave automatically on Linux #11287

Open

bsclifton modified the milestones: Triage Backlog, 0.20.x (Beta Channel) Nov 3, 2017

Multiple channels release with different installed location and user dir

da9851e

@Auditors: @bsclifton, @bridiver, @bbondy, @aekeus

darkdh force-pushed the coexisted-channels branch from 65d19cc to da9851e Compare November 3, 2017 21:12

bsclifton approved these changes Nov 3, 2017

View reviewed changes

bsclifton merged commit c83e123 into master Nov 3, 2017

bsclifton deleted the coexisted-channels branch November 3, 2017 21:19

darkdh pushed a commit that referenced this pull request Nov 3, 2017

Merge pull request #10552 from brave/coexisted-channels

47f48f3

Multiple channels release with different installed locations and user dir

darkdh pushed a commit that referenced this pull request Nov 3, 2017

Merge pull request #10552 from brave/coexisted-channels

cf6a8b5

Multiple channels release with different installed locations and user dir

bsclifton mentioned this pull request Nov 13, 2017

Folders from other channels need to be disregarded when building package #11939

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Multiple channels release with different installed locations and user dir #10552

Multiple channels release with different installed locations and user dir #10552

darkdh commented Aug 17, 2017 •

edited by bsclifton

Loading

codecov-io commented Aug 17, 2017 •

edited

Loading

aekeus Aug 18, 2017

aekeus Aug 18, 2017

aekeus Aug 18, 2017

bsclifton commented Aug 29, 2017

bridiver commented Aug 29, 2017

bsclifton Aug 29, 2017 •

edited

Loading

bsclifton commented Sep 6, 2017

darkdh commented Sep 6, 2017

luixxiul commented Sep 7, 2017

bradleyrichter commented Sep 8, 2017 via email

bsclifton commented Sep 8, 2017

darkdh commented Sep 8, 2017

bradleyrichter commented Sep 8, 2017 via email

bsclifton commented Sep 8, 2017

bradleyrichter commented Sep 8, 2017 via email

bsclifton Sep 8, 2017 •

edited

Loading

darkdh Sep 11, 2017

bsclifton Sep 12, 2017

bsclifton Sep 8, 2017

bsclifton left a comment •

edited

Loading

cezaraugusto commented Oct 28, 2017

bsclifton commented Oct 28, 2017

bsclifton commented Oct 28, 2017

darkdh commented Oct 29, 2017

bsclifton left a comment

bsclifton commented Nov 3, 2017 •

edited by darkdh

Loading


		const channel = env.CHANNEL

		var channels = { nightly: true, developer: true, beta: true, dev: true }

Multiple channels release with different installed locations and user dir #10552

Multiple channels release with different installed locations and user dir #10552

Conversation

darkdh commented Aug 17, 2017 • edited by bsclifton Loading

Todo:

codecov-io commented Aug 17, 2017 • edited Loading

Codecov Report

aekeus Aug 18, 2017

Choose a reason for hiding this comment

aekeus Aug 18, 2017

Choose a reason for hiding this comment

aekeus Aug 18, 2017

Choose a reason for hiding this comment

bsclifton commented Aug 29, 2017

bridiver commented Aug 29, 2017

bsclifton Aug 29, 2017 • edited Loading

Choose a reason for hiding this comment

bsclifton commented Sep 6, 2017

darkdh commented Sep 6, 2017

luixxiul commented Sep 7, 2017

bradleyrichter commented Sep 8, 2017 via email

bsclifton commented Sep 8, 2017

darkdh commented Sep 8, 2017

bradleyrichter commented Sep 8, 2017 via email

bsclifton commented Sep 8, 2017

bradleyrichter commented Sep 8, 2017 via email

bsclifton Sep 8, 2017 • edited Loading

Choose a reason for hiding this comment

darkdh Sep 11, 2017

Choose a reason for hiding this comment

bsclifton Sep 12, 2017

Choose a reason for hiding this comment

bsclifton Sep 8, 2017

Choose a reason for hiding this comment

bsclifton left a comment • edited Loading

Choose a reason for hiding this comment

cezaraugusto commented Oct 28, 2017

bsclifton commented Oct 28, 2017

bsclifton commented Oct 28, 2017

darkdh commented Oct 29, 2017

bsclifton left a comment

Choose a reason for hiding this comment

bsclifton commented Nov 3, 2017 • edited by darkdh Loading

darkdh commented Aug 17, 2017 •

edited by bsclifton

Loading

codecov-io commented Aug 17, 2017 •

edited

Loading

bsclifton Aug 29, 2017 •

edited

Loading

bsclifton Sep 8, 2017 •

edited

Loading

bsclifton left a comment •

edited

Loading

bsclifton commented Nov 3, 2017 •

edited by darkdh

Loading