From 52affebcb87d3fe5612661be773e0a91b6fc0ab9 Mon Sep 17 00:00:00 2001 From: David Glasser Date: Fri, 23 Jan 2015 17:06:44 -0800 Subject: [PATCH 1/9] docs: disable appcache on Firefox Fixes #3248. --- docs/lib/appcache-config.js | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/docs/lib/appcache-config.js b/docs/lib/appcache-config.js index e6b270b261..1ca88b11c0 100644 --- a/docs/lib/appcache-config.js +++ b/docs/lib/appcache-config.js @@ -1,11 +1,12 @@ -// Turn off appcache on Safari. Apparently Safari 7's AppCache is -// totally busted. In particular, this fact combined with our -// "RELOAD_SAFETYBELT" strategy causes infinite reloads in Safari at -// times. -// -// See http://stackoverflow.com/questions/22888945/safari-7-application-cache-does-not-work if (Meteor.isServer) { Meteor.AppCache.config({ - safari: false + // Turn off appcache on Safari. Apparently Safari 7's AppCache is totally + // busted. In particular, this fact combined with our "RELOAD_SAFETYBELT" + // strategy causes infinite reloads in Safari at times. + // + // See http://stackoverflow.com/questions/22888945/safari-7-application-cache-does-not-work + safari: false, + // ... and Firefox too. See eg https://github.com/meteor/meteor/issues/3248 + firefox: false }); } From f2f0482c690b5819767423af0b47ea3e7c5a8a61 Mon Sep 17 00:00:00 2001 From: David Glasser Date: Tue, 24 Feb 2015 12:18:10 -0800 Subject: [PATCH 2/9] Revert "Kill PhantomJS processes after `meteor --test`" This reverts commit cd014c76004ed86f4d305a3c0c1a079a45118144. This was intended to be placed on devel (see #3205) and I accidentally placed it on master. --- tools/run-velocity.js | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/tools/run-velocity.js b/tools/run-velocity.js index e78771513a..e7a9ba489e 100644 --- a/tools/run-velocity.js +++ b/tools/run-velocity.js @@ -22,17 +22,8 @@ var runVelocity = function (url) { // XXX maybe a startup message so users know the tests are running. - // All running browser processes that visit the mirror pages - var browserProcesses = []; var ddpConnection = DDP.connect(url); - var killBrowserProcesses = function () { - browserProcesses.forEach(function (browserProcess) { - browserProcess.kill('SIGINT'); - }); - browserProcesses = []; - }; - var interval = setInterval(function () { if (ddpConnection.status().status === "connected") { clearInterval(interval); @@ -90,7 +81,6 @@ var runVelocity = function (url) { if (report.name === "aggregateComplete" && report.result === "completed") { setTimeout(function () { - killBrowserProcesses(); if (aggregateResult === "passed") { console.log("TESTS RAN SUCCESSFULLY"); // XXX XXX this is not great. We shouldn't be @@ -114,12 +104,11 @@ var runVelocity = function (url) { function visitWithPhantom (url) { var phantomScript = "require('webpage').create().open('" + url + "');"; - var browserProcess = child_process.execFile( + child_process.execFile( '/bin/bash', ['-c', ("exec " + phantomjs.path + " /dev/stdin <<'END'\n" + phantomScript + "END\n")]); - browserProcesses.push(browserProcess); } ddpConnection.subscribe("VelocityMirrors", { From 89381e98cd45f5b70cb606f6464ec36cf5af8376 Mon Sep 17 00:00:00 2001 From: David Glasser Date: Thu, 5 Feb 2015 08:55:49 -0800 Subject: [PATCH 3/9] Fix crash when downloading second package build The logic to figure out which build dirs are temp dirs which need to be freed and which are not was wrong, since it missed the non-temp files.pathResolve(files.pathDirname(packagePath), packageLinkTarget)); Use a more explicit way of tracking this. (Fixed merge conflict when merging from devel.) --- tools/tropohouse.js | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/tools/tropohouse.js b/tools/tropohouse.js index 68a228095e..96dd3b8cc9 100644 --- a/tools/tropohouse.js +++ b/tools/tropohouse.js @@ -303,10 +303,11 @@ _.extend(exports.Tropohouse.prototype, { buildmessage.enterJob({ title: "downloading " + packageName + "@" + version + "..." }, function() { + var buildInputDirs = []; var buildTempDirs = []; // If there's already a package in the tropohouse, start with it. if (packageLinkTarget) { - buildTempDirs.push( + buildInputDirs.push( files.pathResolve(files.pathDirname(packageLinkFile), packageLinkTarget)); } @@ -315,20 +316,22 @@ _.extend(exports.Tropohouse.prototype, { // warehouse? _.each(buildsToDownload, function (build) { try { - buildTempDirs.push(self._downloadBuildToTempDir( - { packageName: packageName, version: version }, build)); + var buildTempDir = self._downloadBuildToTempDir( + { packageName: packageName, version: version }, build); } catch (e) { if (!(e instanceof files.OfflineError)) throw e; buildmessage.error(e.error.message); } + buildInputDirs.push(buildTempDir); + buildTempDirs.push(buildTempDir); }); if (buildmessage.jobHasMessages()) return; // We need to turn our builds into a single isopack. var isopack = new Isopack; - _.each(buildTempDirs, function (buildTempDir, i) { + _.each(buildInputDirs, function (buildTempDir, i) { isopack._loadUnibuildsFromPath( packageName, buildTempDir, From 58c58b0320f533c2e48b0dbf95367884063a2758 Mon Sep 17 00:00:00 2001 From: David Glasser Date: Tue, 24 Feb 2015 12:40:51 -0800 Subject: [PATCH 4/9] METEOR@1.0.3.2-rc.0 --- packages/meteor-tool/package.js | 2 +- scripts/admin/meteor-release-experimental.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js index c7e4d4712d..5bc75cd9ab 100644 --- a/packages/meteor-tool/package.js +++ b/packages/meteor-tool/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "The Meteor command-line tool", - version: '1.0.40' + version: '1.0.41-rc.0' }); Package.includeTool(); diff --git a/scripts/admin/meteor-release-experimental.json b/scripts/admin/meteor-release-experimental.json index f5d7d0aba9..2521cc9e2f 100644 --- a/scripts/admin/meteor-release-experimental.json +++ b/scripts/admin/meteor-release-experimental.json @@ -1,6 +1,6 @@ { "track": "METEOR", - "version": "1.0.3-rc.1", + "version": "1.0.3.2-rc.0", "recommended": false, "official": false, "description": "An RC of Meteor 1.0.3" From 18c6183926b391bad801ea273739a080f2935ca7 Mon Sep 17 00:00:00 2001 From: David Glasser Date: Tue, 24 Feb 2015 15:19:20 -0800 Subject: [PATCH 5/9] History update --- History.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/History.md b/History.md index 5bce619cc1..447ca27cb5 100644 --- a/History.md +++ b/History.md @@ -1,3 +1,10 @@ +## v.1.0.3.2, 2015-???-?? + +* Fix regression in 1.0.3 where the `meteor` tool could crash when downloading + the second build of a given package version; for example, when running `meteor + deploy` on an OSX or 32-bit Linux system for an app containing a binary + package. #3761 + ## v.1.0.3, 2015-Jan-20 * Rewrite `meteor show` and `meteor search` to show package information for From d1e76b52cbe7662e83f991587e7d82d180d70a34 Mon Sep 17 00:00:00 2001 From: David Glasser Date: Tue, 24 Feb 2015 15:48:20 -0800 Subject: [PATCH 6/9] Update examples and docs to 1.0.3.2-rc.0 --- docs/.meteor/release | 2 +- examples/clock/.meteor/release | 2 +- examples/leaderboard/.meteor/release | 2 +- examples/localmarket/.meteor/release | 2 +- examples/todos/.meteor/release | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/.meteor/release b/docs/.meteor/release index 90f87be959..c445d4f7e0 100644 --- a/docs/.meteor/release +++ b/docs/.meteor/release @@ -1 +1 @@ -METEOR@1.0.3.1 +METEOR@1.0.3.2-rc.0 diff --git a/examples/clock/.meteor/release b/examples/clock/.meteor/release index 90f87be959..c445d4f7e0 100644 --- a/examples/clock/.meteor/release +++ b/examples/clock/.meteor/release @@ -1 +1 @@ -METEOR@1.0.3.1 +METEOR@1.0.3.2-rc.0 diff --git a/examples/leaderboard/.meteor/release b/examples/leaderboard/.meteor/release index 90f87be959..c445d4f7e0 100644 --- a/examples/leaderboard/.meteor/release +++ b/examples/leaderboard/.meteor/release @@ -1 +1 @@ -METEOR@1.0.3.1 +METEOR@1.0.3.2-rc.0 diff --git a/examples/localmarket/.meteor/release b/examples/localmarket/.meteor/release index 90f87be959..c445d4f7e0 100644 --- a/examples/localmarket/.meteor/release +++ b/examples/localmarket/.meteor/release @@ -1 +1 @@ -METEOR@1.0.3.1 +METEOR@1.0.3.2-rc.0 diff --git a/examples/todos/.meteor/release b/examples/todos/.meteor/release index 90f87be959..c445d4f7e0 100644 --- a/examples/todos/.meteor/release +++ b/examples/todos/.meteor/release @@ -1 +1 @@ -METEOR@1.0.3.1 +METEOR@1.0.3.2-rc.0 From 67a45935e066e6c75d400f9fcac14c4c5c3b1283 Mon Sep 17 00:00:00 2001 From: David Glasser Date: Tue, 24 Feb 2015 16:24:42 -0800 Subject: [PATCH 7/9] banner update for 1.0.3.2 --- scripts/admin/banners.json | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/scripts/admin/banners.json b/scripts/admin/banners.json index d4838543f9..66419c0638 100644 --- a/scripts/admin/banners.json +++ b/scripts/admin/banners.json @@ -5,8 +5,14 @@ "0.9.2.1", "0.9.2.2", "0.9.3", "0.9.3.1", "0.9.4", "1.0", "1.0.1", "1.0.2", "1.0.2.1", "1.0.3"], "banner": { - "text": "=> Meteor 1.0.3.1: README.md support in Isobuild and improvements to `meteor show`.\n\n This release is being downloaded in the background. Update your app to\n Meteor 1.0.3.1 by running 'meteor update'." + "text": "=> Meteor 1.0.3.2: README.md support in Isobuild and improvements to `meteor show`.\n\n This release is being downloaded in the background. Update your app to\n Meteor 1.0.3.2 by running 'meteor update'." } + }, + { + "versions": ["1.0.3.1"], + "banner": { + "text": "=> Meteor 1.0.3.2: Fixes a crash in `meteor deploy`.\n\n This release is being downloaded in the background. Update your app to\n Meteor 1.0.3.2 by running 'meteor update'." + } } ] } From 0b8a33282eb464ab5b902df5be176663556e35b4 Mon Sep 17 00:00:00 2001 From: David Glasser Date: Wed, 25 Feb 2015 08:55:21 -0800 Subject: [PATCH 8/9] METEOR@1.0.3.2 --- packages/meteor-tool/package.js | 2 +- scripts/admin/meteor-release-official.json | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js index 5bc75cd9ab..7c2f177a28 100644 --- a/packages/meteor-tool/package.js +++ b/packages/meteor-tool/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "The Meteor command-line tool", - version: '1.0.41-rc.0' + version: '1.0.41' }); Package.includeTool(); diff --git a/scripts/admin/meteor-release-official.json b/scripts/admin/meteor-release-official.json index 124bee9977..014318f3ea 100644 --- a/scripts/admin/meteor-release-official.json +++ b/scripts/admin/meteor-release-official.json @@ -1,6 +1,7 @@ { "track": "METEOR", - "version": "1.0.3.1", + "version": "1.0.3.2", + "patchFrom": ["1.0.3", "1.0.3.1"], "recommended": false, "official": true, "description": "The Official Meteor Distribution" From 749ecb81addfef0abd7a24acdc0cdb3078b8107d Mon Sep 17 00:00:00 2001 From: David Glasser Date: Wed, 25 Feb 2015 09:32:21 -0800 Subject: [PATCH 9/9] update docs and examples for 1.0.3.2 --- docs/.meteor/release | 2 +- docs/client/helpers.js | 2 +- examples/clock/.meteor/release | 2 +- examples/leaderboard/.meteor/release | 2 +- examples/localmarket/.meteor/release | 2 +- examples/todos/.meteor/release | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/.meteor/release b/docs/.meteor/release index c445d4f7e0..74a74cb1ba 100644 --- a/docs/.meteor/release +++ b/docs/.meteor/release @@ -1 +1 @@ -METEOR@1.0.3.2-rc.0 +METEOR@1.0.3.2 diff --git a/docs/client/helpers.js b/docs/client/helpers.js index 0097222c96..eb0aed864f 100644 --- a/docs/client/helpers.js +++ b/docs/client/helpers.js @@ -1,4 +1,4 @@ -release = Meteor.release ? "1.0.3.1" : "(checkout)"; +release = Meteor.release ? "1.0.3.2" : "(checkout)"; Template.registerHelper("release", release); diff --git a/examples/clock/.meteor/release b/examples/clock/.meteor/release index c445d4f7e0..74a74cb1ba 100644 --- a/examples/clock/.meteor/release +++ b/examples/clock/.meteor/release @@ -1 +1 @@ -METEOR@1.0.3.2-rc.0 +METEOR@1.0.3.2 diff --git a/examples/leaderboard/.meteor/release b/examples/leaderboard/.meteor/release index c445d4f7e0..74a74cb1ba 100644 --- a/examples/leaderboard/.meteor/release +++ b/examples/leaderboard/.meteor/release @@ -1 +1 @@ -METEOR@1.0.3.2-rc.0 +METEOR@1.0.3.2 diff --git a/examples/localmarket/.meteor/release b/examples/localmarket/.meteor/release index c445d4f7e0..74a74cb1ba 100644 --- a/examples/localmarket/.meteor/release +++ b/examples/localmarket/.meteor/release @@ -1 +1 @@ -METEOR@1.0.3.2-rc.0 +METEOR@1.0.3.2 diff --git a/examples/todos/.meteor/release b/examples/todos/.meteor/release index c445d4f7e0..74a74cb1ba 100644 --- a/examples/todos/.meteor/release +++ b/examples/todos/.meteor/release @@ -1 +1 @@ -METEOR@1.0.3.2-rc.0 +METEOR@1.0.3.2