Skip to content

Commit 236b7f6

Browse files
committed
Merge pull request #110 from 10gen/INT-198-disable-signing
INT-198 optionally disable installer signing
2 parents 4dad0e1 + 62beb61 commit 236b7f6

File tree

2 files changed

+14
-6
lines changed

2 files changed

+14
-6
lines changed

.evergreen.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ tasks:
8686
bucket: mciuploads
8787
permissions: public-read
8888
content_type: ${installer_content_type|application/octet-stream}
89-
display_name: Installer
89+
display_name: "Installer: ${installer_filename}"
9090

9191
# - name: test
9292
# depends_on:
@@ -106,7 +106,7 @@ buildvariants:
106106
run_on:
107107
- "osx-108"
108108
expansions:
109-
add_environment: ""
109+
add_environment: "SCOUT_INSTALLER_UNSIGNED=1"
110110
add_path: /opt/node/bin
111111
installer_content_type: "application/x-apple-diskimage"
112112
installer_filename: "MongoDB Scout.dmg"

tasks/darwin.js

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,10 +80,18 @@ var verify = function(done) {
8080

8181
module.exports.installer = function(done) {
8282
debug('running packager...');
83-
packager(CONFIG, function(err) {
84-
if (err) return done(err);
83+
var doCodeSign = process.env.SCOUT_INSTALLER_UNSIGNED === undefined;
8584

86-
codesign(function(err) {
85+
// TODO: clean up with https://www.npmjs.com/package/run-series ?
86+
if (! doCodeSign) {
87+
CONFIG.sign = null;
88+
packager(CONFIG, function(err) {
89+
if (err) return done(err);
90+
91+
createDMG(CONFIG, done);
92+
});
93+
} else {
94+
packager(CONFIG, function(err) {
8795
if (err) return done(err);
8896

8997
verify(function(err) {
@@ -92,5 +100,5 @@ module.exports.installer = function(done) {
92100
createDMG(CONFIG, done);
93101
});
94102
});
95-
});
103+
}
96104
};

0 commit comments

Comments
 (0)