From 25b690454f51e54b778dc50d963fa96eeda887bb Mon Sep 17 00:00:00 2001 From: Max Brunsfeld Date: Wed, 14 Oct 2015 13:56:05 -0700 Subject: [PATCH 1/4] :arrow_up: grunt-electron-installer --- build/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/package.json b/build/package.json index ad483c75f..93354cdbd 100644 --- a/build/package.json +++ b/build/package.json @@ -22,7 +22,7 @@ "grunt-contrib-less": "~0.8.0", "grunt-cson": "0.16.0", "grunt-download-electron": "^2.1.1", - "grunt-electron-installer": "1.0.5", + "grunt-electron-installer": "1.0.6", "grunt-lesslint": "0.17.0", "grunt-peg": "~1.1.0", "grunt-shell": "~0.3.1", From 511ab462464085a128a8cf1905535bb5df0d6e53 Mon Sep 17 00:00:00 2001 From: Max Brunsfeld Date: Wed, 14 Oct 2015 13:58:15 -0700 Subject: [PATCH 2/4] Don't format version for windows installer We're just going to use names like '1.1.0-beta1' that are compatible with NuGet, so that the versions that squirrel.windows requests match the names of the github releases --- build/tasks/publish-build-task.coffee | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/build/tasks/publish-build-task.coffee b/build/tasks/publish-build-task.coffee index 53cd8aedb..d1640a42b 100644 --- a/build/tasks/publish-build-task.coffee +++ b/build/tasks/publish-build-task.coffee @@ -6,7 +6,6 @@ async = require 'async' fs = require 'fs-plus' GitHub = require 'github-releases' request = require 'request' -{convertVersion} = require 'grunt-electron-installer' grunt = null @@ -79,9 +78,8 @@ getAssets = -> {assetName: 'atom-api.json', sourcePath: 'atom-api.json'} ] when 'win32' - nupkgVersion = convertVersion(version) assets = [{assetName: 'atom-windows.zip', sourcePath: appName}] - for squirrelAsset in ['AtomSetup.exe', 'RELEASES', "atom-#{nupkgVersion}-full.nupkg", "atom-#{nupkgVersion}-delta.nupkg"] + for squirrelAsset in ['AtomSetup.exe', 'RELEASES', "atom-#{version}-full.nupkg", "atom-#{version}-delta.nupkg"] cp path.join(buildDir, 'installer', squirrelAsset), path.join(buildDir, squirrelAsset) assets.push({assetName: squirrelAsset, sourcePath: assetName}) assets From fdb16422701d085587691edd740e762cd34756bc Mon Sep 17 00:00:00 2001 From: Max Brunsfeld Date: Wed, 14 Oct 2015 14:04:20 -0700 Subject: [PATCH 3/4] Include version query parameter for windows auto-updates Squirrel.Windows supports this now, and we need it to distinguish beta from stable versions --- src/browser/auto-update-manager.coffee | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/browser/auto-update-manager.coffee b/src/browser/auto-update-manager.coffee index ca711eb83..55ab2462b 100644 --- a/src/browser/auto-update-manager.coffee +++ b/src/browser/auto-update-manager.coffee @@ -17,14 +17,8 @@ class AutoUpdateManager constructor: (@version, @testMode, @disabled) -> @state = IdleState - if process.platform is 'win32' - # Squirrel for Windows can't handle query params - # https://github.com/Squirrel/Squirrel.Windows/issues/132 - @feedUrl = 'https://atom.io/api/updates' - else - @iconPath = path.resolve(__dirname, '..', '..', 'resources', 'atom.png') - @feedUrl = "https://atom.io/api/updates?version=#{@version}" - + @iconPath = path.resolve(__dirname, '..', '..', 'resources', 'atom.png') + @feedUrl = "https://atom.io/api/updates?version=#{@version}" process.nextTick => @setupAutoUpdater() setupAutoUpdater: -> From 03d2b7783724893df21772ffa9dfd4db8563d695 Mon Sep 17 00:00:00 2001 From: Ben Ogle Date: Mon, 19 Oct 2015 18:16:04 -0700 Subject: [PATCH 4/4] :arrow_up: metrics@0.53.0 Conflicts: package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3d5038068..fe4e541b3 100644 --- a/package.json +++ b/package.json @@ -96,7 +96,7 @@ "line-ending-selector": "0.2.0", "link": "0.31.0", "markdown-preview": "0.154.0", - "metrics": "0.52.0", + "metrics": "0.53.0", "notifications": "0.59.0", "open-on-github": "0.38.0", "package-generator": "0.40.0",