Skip to content

Commit 1670a47

Browse files
committed
Run tests except karma on windows
1 parent 2127e43 commit 1670a47

File tree

5 files changed

+20
-5
lines changed

5 files changed

+20
-5
lines changed

.evergreen.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,7 @@ tasks:
181181
- name: release_win
182182
depends_on:
183183
- name: check
184+
- name: test
184185
commands:
185186
- func: checkout
186187
- func: install
@@ -214,6 +215,7 @@ buildvariants:
214215
run_on: windows-64-vs2019-test
215216
tasks:
216217
- name: check
218+
- name: test
217219
- name: release_win
218220
- name: windows_ps
219221
display_name: "Windows VS 2019 PowerShell"

config/build.conf.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,5 +60,6 @@ module.exports = {
6060
segmentKey: process.env.SEGMENT_API_KEY,
6161
appleUser: process.env.APPLE_DEV_USER,
6262
applePassword: process.env.APPLE_DEV_PASSWORD,
63-
appleAppIdentity: process.env.APPLE_APP_IDENTITY
63+
appleAppIdentity: process.env.APPLE_APP_IDENTITY,
64+
isCi: process.env.IS_CI
6465
};

packages/browser-repl/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
"start": "npm run storybook",
1515
"storybook": "start-storybook -p 6006",
1616
"test": "karma start ./config/karma.conf.js --colors",
17-
"test-ci": "npm run lint && npm run test",
1817
"lint": "eslint \"**/*.{js,ts,tsx}\"",
1918
"check": "npm run lint",
2019
"compile-ts": "npm run build"

packages/build/src/macos-sign.ts

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,15 @@ import { notarize as nodeNotarize } from 'electron-notarize';
55
import Config from './config';
66
import zip from './zip';
77

8+
/**
9+
* Notarizes the zipped mongosh. Will send the zip to Apple and poll apple
10+
* for the notarization result.
11+
*
12+
* @param {string} bundleId - The bundle id (com.mongodb.mongosh)
13+
* @param {string} artifact - The path to the zip.
14+
* @param {string} user - The apple dev account user.
15+
* @param {string} password - The apple dev account password.
16+
*/
817
const notarize = (bundleId: string, artifact: string, user: string, password: string) => {
918
return nodeNotarize({
1019
appBundleId: bundleId,
@@ -14,6 +23,12 @@ const notarize = (bundleId: string, artifact: string, user: string, password: st
1423
});
1524
};
1625

26+
/**
27+
* Signs the executable via codesign.
28+
*
29+
* @param {string} executable - The mongosh executable.
30+
* @param {string} identity - The apple developer identity.
31+
*/
1732
const sign = (executable: string, identity: string) => {
1833
return new Promise((resolve, reject) => {
1934
codesign({ identity: identity, appPath: executable }, (err, paths) => {

packages/cli-repl/bin/mongosh.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
const { CliRepl, parseCliArgs, mapCliToDriver, generateUri, USAGE } = require('../lib');
22

3-
process.title = 'mongosh';
4-
53
try {
64
const options = parseCliArgs(process.argv);
75
const { version } = require('../package.json');
@@ -11,10 +9,10 @@ try {
119
} else if (options.version) {
1210
console.log(version);
1311
} else {
12+
process.title = 'mongosh';
1413
const driverOptions = mapCliToDriver(options);
1514
const driverUri = generateUri(options);
1615
const appname = `${process.title} ${version}`;
17-
1816
new CliRepl(driverUri, { appname, ...driverOptions }, options);
1917
}
2018
} catch (e) {

0 commit comments

Comments
 (0)