From 905a7ae7aefeda8e5f31e8a8d5ecf3e7f92d7d2b Mon Sep 17 00:00:00 2001 From: Matt Kangas Date: Sun, 23 Aug 2015 16:46:15 -0400 Subject: [PATCH 1/3] INT-198 Disable code signing by environment variable SCOUT_INSTALLER_UNSIGNED Need until notary-service is able to support OS X builds --- tasks/darwin.js | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/tasks/darwin.js b/tasks/darwin.js index 21285dc2b70..1adf8337b7d 100644 --- a/tasks/darwin.js +++ b/tasks/darwin.js @@ -80,10 +80,18 @@ var verify = function(done) { module.exports.installer = function(done) { debug('running packager...'); - packager(CONFIG, function(err) { - if (err) return done(err); + var doCodeSign = process.env.SCOUT_INSTALLER_UNSIGNED === undefined; - codesign(function(err) { + // TODO: clean up with https://www.npmjs.com/package/run-series ? + if (! doCodeSign) { + CONFIG.sign = null; + packager(CONFIG, function(err) { + if (err) return done(err); + + createDMG(CONFIG, done); + }); + } else { + packager(CONFIG, function(err) { if (err) return done(err); verify(function(err) { @@ -92,5 +100,5 @@ module.exports.installer = function(done) { createDMG(CONFIG, done); }); }); - }); + } }; From 654c3b64e3dde44efd60734d0e0277f0b5ec1b19 Mon Sep 17 00:00:00 2001 From: Matt Kangas Date: Sun, 23 Aug 2015 16:49:20 -0400 Subject: [PATCH 2/3] INT-198 Disable signing for OS X Evergreen builds --- .evergreen.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.evergreen.yml b/.evergreen.yml index cc2621b76f1..69df743be7f 100644 --- a/.evergreen.yml +++ b/.evergreen.yml @@ -106,7 +106,7 @@ buildvariants: run_on: - "osx-108" expansions: - add_environment: "" + add_environment: "SCOUT_INSTALLER_UNSIGNED=1" add_path: /opt/node/bin installer_content_type: "application/x-apple-diskimage" installer_filename: "MongoDB Scout.dmg" From 62beb6110c51f4fcabd43070b93b1761d07404bb Mon Sep 17 00:00:00 2001 From: Matt Kangas Date: Mon, 24 Aug 2015 12:51:38 -0400 Subject: [PATCH 3/3] INT-198 improve Evergreen display name for installer --- .evergreen.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.evergreen.yml b/.evergreen.yml index 69df743be7f..dc3c9d65d72 100644 --- a/.evergreen.yml +++ b/.evergreen.yml @@ -86,7 +86,7 @@ tasks: bucket: mciuploads permissions: public-read content_type: ${installer_content_type|application/octet-stream} - display_name: Installer + display_name: "Installer: ${installer_filename}" # - name: test # depends_on: