From 4f6107d54c2d1e45bfff2942c94313c3b1cc1784 Mon Sep 17 00:00:00 2001 From: Lucas Hrabovsky Date: Fri, 6 May 2016 15:47:12 -0400 Subject: [PATCH 1/5] Export leafybots github api token so assets are uploaded to GitHub --- .evergreen.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.evergreen.yml b/.evergreen.yml index b4af5a81ced..4a2bdb36e4b 100644 --- a/.evergreen.yml +++ b/.evergreen.yml @@ -289,6 +289,7 @@ functions: export PATH="${node_path}:$PATH" export CI=1 export EVERGREEN=1 + export GITHUB_TOKEN=${leafybot_github_token} test -n '${add_env_appdata|}' && export APPDATA='${add_env_appdata|}' ${npm|npm} run upload; From 9f0efc5d88e4f1eba93a37ab258fdddff4bbb76a Mon Sep 17 00:00:00 2001 From: Lucas Hrabovsky Date: Fri, 6 May 2016 23:20:10 -0400 Subject: [PATCH 2/5] Add environment variables for download center upload --- .evergreen.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.evergreen.yml b/.evergreen.yml index 4a2bdb36e4b..a46b7529bfa 100644 --- a/.evergreen.yml +++ b/.evergreen.yml @@ -290,6 +290,8 @@ functions: export CI=1 export EVERGREEN=1 export GITHUB_TOKEN=${leafybot_github_token} + export DOWNLOAD_CENTER_AWS_ACCESS_KEY_ID=${aws_key_evergreen_integrations} + export DOWNLOAD_CENTER_AWS_SECRET_ACCESS_KEY=${aws_secret_evergreen_integrations} test -n '${add_env_appdata|}' && export APPDATA='${add_env_appdata|}' ${npm|npm} run upload; From acc691cccf7298a42528d4453b8163b1b2607bdd Mon Sep 17 00:00:00 2001 From: Lucas Hrabovsky Date: Mon, 9 May 2016 14:15:36 -0400 Subject: [PATCH 3/5] Make auto update preference accessible in the UI --- src/app/network-optin/index.jade | 7 ++++++- src/app/network-optin/index.js | 15 ++++++++++++--- src/auto-update/index.js | 3 --- 3 files changed, 18 insertions(+), 7 deletions(-) diff --git a/src/app/network-optin/index.jade b/src/app/network-optin/index.jade index fe1bbc1ebfc..462c66ca8d7 100644 --- a/src/app/network-optin/index.jade +++ b/src/app/network-optin/index.jade @@ -24,7 +24,12 @@ input(type='checkbox', name='trackUsageStatistics', data-hook='usage-stats-checkbox') span Enable Usage Statistics p.option-description Allow Compass to send anonymous usage statistics. - + li + label + input(type='checkbox', name='autoUpdates', data-hook='auto-updates-checkbox') + span Enable Auto Updates + p.option-description Allow Compass to periodically check for new updates + p With any of these options, none of your personal information or stored data will be submitted. .modal-footer diff --git a/src/app/network-optin/index.js b/src/app/network-optin/index.js index f3e5acd61af..df1f8c14dee 100644 --- a/src/app/network-optin/index.js +++ b/src/app/network-optin/index.js @@ -41,6 +41,11 @@ var NetworkOptInView = View.extend({ hook: 'product-feedback-checkbox', name: 'checked' }, + autoUpdates: { + type: 'booleanAttribute', + hook: 'auto-updates-checkbox', + name: 'checked' + }, trackUsageStatistics: { type: 'booleanAttribute', hook: 'usage-stats-checkbox', @@ -59,13 +64,14 @@ var NetworkOptInView = View.extend({ this.trackErrors = true; this.enableFeedbackPanel = true; this.trackUsageStatistics = true; - // this.autoUpdates = true; + this.autoUpdates = true; } else { debug('seen this dialog before, show the real settings'); this.buttonTitle = 'Close'; this.trackErrors = app.preferences.trackErrors; this.enableFeedbackPanel = app.preferences.enableFeedbackPanel; this.trackUsageStatistics = app.preferences.trackUsageStatistics; + this.autoUpdates = app.preferences.autoUpdates; } }, checkboxChanged: function(evt) { @@ -76,7 +82,9 @@ var NetworkOptInView = View.extend({ buttonClicked: function() { var features = [ 'enableFeedbackPanel', - 'trackUsageStatistics' + 'trackUsageStatistics', + 'trackErrors', + 'autoUpdates' ]; this.preferences.set('showedNetworkOptIn', true); @@ -94,7 +102,8 @@ var NetworkOptInView = View.extend({ var metadata = { 'track usage stats': settings.trackUsageStatistics, 'product feedback': settings.enableFeedbackPanel, - 'track errors': settings.trackErrors + 'track errors': settings.trackErrors, + 'auto updates': settings.autoUpdates }; metrics.track('Network Opt-in', 'used', metadata); }, diff --git a/src/auto-update/index.js b/src/auto-update/index.js index e087ee60c6a..102da99b1d8 100644 --- a/src/auto-update/index.js +++ b/src/auto-update/index.js @@ -26,9 +26,6 @@ var NotificationUpdateAvailable = View.extend({ 'click a[data-hook=install-update]': 'installUpdate' }, initialize: function() { - if (!app.isFeatureEnabled('autoUpdates')) { - return debug('autoUpdates feature flag off'); - } ipc.on('app:checking-for-update', function() { debug('checking for update'); metrics.track('Auto Update', 'checking-for-update'); From 3fe12f8170ef197cd20849d35033f0049798f360 Mon Sep 17 00:00:00 2001 From: Lucas Hrabovsky Date: Tue, 10 May 2016 14:43:01 -0400 Subject: [PATCH 4/5] Canonoical display names for release assets --- .evergreen.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.evergreen.yml b/.evergreen.yml index a46b7529bfa..dcb93af2244 100644 --- a/.evergreen.yml +++ b/.evergreen.yml @@ -181,33 +181,33 @@ functions: aws_key: ${aws_key} aws_secret: ${aws_secret} local_file: "src/dist/${windows_setup_filename}" - remote_file: "${project}/${build_variant}/${revision}/${windows_setup_filename}" + remote_file: "${project}/${build_variant}/${revision}/${name}-${version}-${platform}-${arch}.exe" bucket: mciuploads permissions: public-read content_type: application/octet-stream - display_name: "${windows_setup_label}" + display_name: "${name}-${version}-${platform}-${arch}.exe" # MSI - command: s3.put params: aws_key: ${aws_key} aws_secret: ${aws_secret} local_file: "src/dist/${windows_msi_filename}" - remote_file: "${project}/${build_variant}/${revision}/${windows_msi_filename}" + remote_file: "${project}/${build_variant}/${revision}/${name}-${version}-${platform}-${arch}.msi" bucket: mciuploads permissions: public-read content_type: application/octet-stream - display_name: "${windows_msi_label}" + display_name: "${name}-${version}-${platform}-${arch}.msi" # ZIP - command: s3.put params: aws_key: ${aws_key} aws_secret: ${aws_secret} local_file: "src/dist/${windows_zip_filename}" - remote_file: "${project}/${build_variant}/${revision}/${windows_zip_filename}" + remote_file: "${project}/${build_variant}/${revision}/${name}-${version}-${platform}-${arch}.zip" bucket: mciuploads permissions: public-read content_type: application/zip - display_name: "${windows_zip_label}" + display_name: "${name}-${version}-${platform}-${arch}.zip" # RELEASES file - command: s3.put params: @@ -238,22 +238,22 @@ functions: aws_key: ${aws_key} aws_secret: ${aws_secret} local_file: "src/dist/${osx_dmg_filename}" - remote_file: "${project}/${build_variant}/${revision}/${osx_dmg_filename}" + remote_file: "${project}/${build_variant}/${revision}/${name}-${version}-${platform}-${arch}.dmg" bucket: mciuploads permissions: public-read content_type: "application/x-apple-diskimage" - display_name: "${osx_dmg_label}" + display_name: "${name}-${version}-${platform}-${arch}.dmg" # .zip - command: s3.put params: aws_key: ${aws_key} aws_secret: ${aws_secret} local_file: "src/dist/${osx_zip_filename}" - remote_file: "${project}/${build_variant}/${revision}/${osx_zip_filename}" + remote_file: "${project}/${build_variant}/${revision}/${name}-${version}-${platform}-${arch}.zip" bucket: mciuploads permissions: public-read content_type: application/zip - display_name: "${osx_zip_label}" + display_name: "${name}-${version}-${platform}-${arch}.zip" "save LICENSE": command: s3.put From fb412fc5be27e91f1732073776e95a346c674a81 Mon Sep 17 00:00:00 2001 From: Lucas Hrabovsky Date: Tue, 10 May 2016 14:29:59 -0400 Subject: [PATCH 5/5] Merge pull request #397 from 10gen/fix-auto-update-preferences persist auto update choice in preferences. --- src/app/network-optin/index.jade | 4 ++-- src/app/network-optin/index.js | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/app/network-optin/index.jade b/src/app/network-optin/index.jade index 462c66ca8d7..a63c72fe25e 100644 --- a/src/app/network-optin/index.jade +++ b/src/app/network-optin/index.jade @@ -27,8 +27,8 @@ li label input(type='checkbox', name='autoUpdates', data-hook='auto-updates-checkbox') - span Enable Auto Updates - p.option-description Allow Compass to periodically check for new updates + span Enable Automatic Updates + p.option-description Allow Compass to periodically check for new updates. p With any of these options, none of your personal information or stored data will be submitted. diff --git a/src/app/network-optin/index.js b/src/app/network-optin/index.js index df1f8c14dee..22d671925e8 100644 --- a/src/app/network-optin/index.js +++ b/src/app/network-optin/index.js @@ -16,7 +16,8 @@ var NetworkOptInView = View.extend({ props: { trackErrors: ['boolean', true, true], enableFeedbackPanel: ['boolean', true, true], - trackUsageStatistics: ['boolean', true, true] + trackUsageStatistics: ['boolean', true, true], + autoUpdates: ['boolean', true, true] }, session: { preferences: 'state',