Skip to content

Commit 3165b47

Browse files
durranimlucaslrlna
authored
COMPASS-3933: Update to Electron 6.0.11 (#1873)
* COMPASS-3933: Update to Electron 6.0.11 * chore(ci): Update node version on travis and evergreen * chore: Remove unused jsfmt config Switched to prettier ages ago * hadron-build@23.0.2: ensure gnome-keyring is set as a requirement for debian OSs * COMPASS-3917: keytar 5 upgrade * build(deps): COMPASS-3933: Update to latest connect and query history plugins ### compass-query-history@7 - COMPASS-3933 COMPASS-4072: Electron 6 and lodash updates mongodb-js/compass-query-history#41 - build(deps-dev): COMPASS-4098: bump electron from 6.1.7 to 7.1.9 mongodb-js/compass-query-history#47 ### compass-connect@5.3.2 - COMPASS-4104 urlencode credentials when using X509 - mongodb-js/compass-connect#82 chore: update dependencies for driver 3.4 and electron 6 COMPASS-4017 * build(deps): COMPASS-3933 update compass-explain-plan - [x] mongodb-js/compass-explain-plan#17 - [x] mongodb-js/compass-explain-plan#33 * COMPASS-3933: Latest metrics and others * update dev deps * remove dupe deps from compass-schema * more extraneous deps * ⬆️ export to lang, crud, schema validation * latest language model * COMPASS-3933: latest agg plugin mongodb-js/compass-aggregations#120 * build(deps): source app-migrations from npm instead of github * build(deps): latest hadron* hadron-app@latest hadron-app-registry@latest hadron-compile-cache@latest hadron-document@latest hadron-module-cache@latest * build(deps): Update all mongodb* to latest - mongodb-ace-autocompleter@0.4.1 - mongodb-extended-json@1.11.0 - mongodb-connection-model@14.4.3 - mongodb-js-metrics@5.0.0 - mongodb-language-model@1.6.1 - mongodb-explain-plan-model@0.2.3 - mongodb-ace-mode@0.4.1 - mongodb@3.5.2 - mongodb-data-service@16.4.0 - mongodb-query-parser@2.0.0 - mongodb-schema@8.2.5 - mongodb-query-util@0.2.1 - mongodb-collection-model@3.1.0 - mongodb-ns@2.2.0 * COMPASS-3933: latest crud Co-authored-by: Lucas Hrabovsky <hrabovsky.lucas@gmail.com> Co-authored-by: Irina Shestak <lrlna@users.noreply.github.com>
1 parent add84d2 commit 3165b47

File tree

7 files changed

+4521
-3545
lines changed

7 files changed

+4521
-3545
lines changed

‎.evergreen.yml

Lines changed: 33 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ post:
2626
- ~/.mongodb/runner/*.log
2727

2828
functions:
29-
"prepare":
29+
'prepare':
3030
- command: git.get_project
3131
params:
3232
directory: src
@@ -70,7 +70,12 @@ functions:
7070
export NPM_TMP_DIR="$(pwd)/.deps/tmp"
7171
export NPM_AUTH_TOKEN="${compass_npm_token}"
7272
73-
export NODE_JS_VERSION="10.2.1"
73+
export NODE_JS_VERSION="12.4.0"
74+
# TODO: lucas: Go back to npm@latest after 6.13.4 released
75+
# or https://jira.mongodb.org/browse/COMPASS-4019 removes jade.
76+
# https://jira.mongodb.org/browse/COMPASS-4018
77+
# export NPM_VERSION="latest"
78+
export NPM_VERSION="6.13.2"
7479
7580
if [[ "$OSTYPE" == "cygwin" ]]; then
7681
export PATH="$(pwd)/.deps:/cygdrive/c/wixtools/bin/:$PATH"
@@ -213,7 +218,7 @@ functions:
213218
# params:
214219
# file: src/plugin/plugin-test-results.xml
215220

216-
"package":
221+
'package':
217222
- command: shell.exec
218223
params:
219224
working_dir: src
@@ -284,7 +289,7 @@ functions:
284289
ls -la dist
285290
fi
286291
287-
"publish":
292+
'publish':
288293
command: shell.exec
289294
params:
290295
working_dir: src
@@ -304,7 +309,7 @@ functions:
304309
echo "Uploading release assets to S3 and GitHub if needed..."
305310
npm run upload ${compass_distribution}
306311
307-
"save windows artifacts":
312+
'save windows artifacts':
308313
# setup
309314
- <<: *save-artifact
310315
params:
@@ -332,33 +337,33 @@ functions:
332337
local_file: src/dist/${windows_nupkg_full_filename}
333338
remote_file: ${project}/${revision}/${windows_nupkg_full_filename}
334339

335-
"save osx artifacts":
340+
'save osx artifacts':
336341
# .dmg
337342
- <<: *save-artifact
338343
params:
339344
local_file: src/dist/${osx_dmg_filename}
340345
remote_file: ${project}/${revision}/${osx_dmg_filename}
341-
content_type: "application/x-apple-diskimage"
346+
content_type: 'application/x-apple-diskimage'
342347
# .zip
343348
- <<: *save-artifact
344349
params:
345350
local_file: src/dist/${osx_zip_filename}
346351
remote_file: ${project}/${revision}/${osx_zip_filename}
347352
content_type: application/zip
348-
"save linux artifacts":
353+
'save linux artifacts':
349354
# .deb
350355
- <<: *save-artifact
351356
params:
352357
local_file: src/dist/${linux_deb_filename}
353358
remote_file: ${project}/${revision}/${linux_deb_filename}
354-
content_type: "application/vnd.debian.binary-package"
359+
content_type: 'application/vnd.debian.binary-package'
355360
# .tar.gz
356361
- <<: *save-artifact
357362
params:
358363
local_file: src/dist/${linux_tar_filename}
359364
remote_file: ${project}/${revision}/${linux_tar_filename}
360365
content_type: application/x-gzip
361-
"save rhel artifacts":
366+
'save rhel artifacts':
362367
# .rpm
363368
- <<: *save-artifact
364369
params:
@@ -386,28 +391,28 @@ tasks:
386391
- func: publish
387392
vars:
388393
compass_distribution: compass
389-
- func: "save osx artifacts"
394+
- func: 'save osx artifacts'
390395
- func: package
391396
vars:
392397
compass_distribution: compass-community
393398
- func: publish
394399
vars:
395400
compass_distribution: compass-community
396-
- func: "save osx artifacts"
401+
- func: 'save osx artifacts'
397402
- func: package
398403
vars:
399404
compass_distribution: compass-isolated
400405
- func: publish
401406
vars:
402407
compass_distribution: compass-isolated
403-
- func: "save osx artifacts"
408+
- func: 'save osx artifacts'
404409
- func: package
405410
vars:
406411
compass_distribution: compass-readonly
407412
- func: publish
408413
vars:
409414
compass_distribution: compass-readonly
410-
- func: "save osx artifacts"
415+
- func: 'save osx artifacts'
411416

412417
- name: compile
413418
depends_on: []
@@ -419,7 +424,7 @@ tasks:
419424
- name: verify
420425
depends_on: [compile]
421426
tags:
422-
- "verify"
427+
- 'verify'
423428
commands:
424429
- func: restore
425430
- func: verify
@@ -436,7 +441,7 @@ tasks:
436441
- name: test-functional
437442
depends_on: [compile]
438443
tags:
439-
- "test"
444+
- 'test'
440445
commands:
441446
- func: restore
442447
- func: test
@@ -477,17 +482,17 @@ tasks:
477482
- func: publish
478483
vars:
479484
compass_distribution: compass
480-
- func: "save windows artifacts"
485+
- func: 'save windows artifacts'
481486
variants: [windows]
482487
# NOTE (@imlucas) Because macos can't utilize task parallelism
483488
# and instead runs `oneshot-compile-test-package-publish`
484489
# save osx artifacts doesn't apply here until we have more than
485490
# 1 macos box setup to run functional tests.
486491
# - func: 'save osx artifacts'
487492
# variants: [macos]
488-
- func: "save linux artifacts"
493+
- func: 'save linux artifacts'
489494
variants: [ubuntu]
490-
- func: "save rhel artifacts"
495+
- func: 'save rhel artifacts'
491496
variants: [rhel]
492497

493498
- name: package-and-publish-compass-community
@@ -500,11 +505,11 @@ tasks:
500505
- func: publish
501506
vars:
502507
compass_distribution: compass-community
503-
- func: "save windows artifacts"
508+
- func: 'save windows artifacts'
504509
variants: [windows]
505-
- func: "save linux artifacts"
510+
- func: 'save linux artifacts'
506511
variants: [ubuntu]
507-
- func: "save rhel artifacts"
512+
- func: 'save rhel artifacts'
508513
variants: [rhel]
509514

510515
- name: package-and-publish-compass-isolated
@@ -517,11 +522,11 @@ tasks:
517522
- func: publish
518523
vars:
519524
compass_distribution: compass-isolated
520-
- func: "save windows artifacts"
525+
- func: 'save windows artifacts'
521526
variants: [windows]
522-
- func: "save linux artifacts"
527+
- func: 'save linux artifacts'
523528
variants: [ubuntu]
524-
- func: "save rhel artifacts"
529+
- func: 'save rhel artifacts'
525530
variants: [rhel]
526531

527532
- name: package-and-publish-compass-readonly
@@ -534,11 +539,11 @@ tasks:
534539
- func: publish
535540
vars:
536541
compass_distribution: compass-readonly
537-
- func: "save windows artifacts"
542+
- func: 'save windows artifacts'
538543
variants: [windows]
539-
- func: "save linux artifacts"
544+
- func: 'save linux artifacts'
540545
variants: [ubuntu]
541-
- func: "save rhel artifacts"
546+
- func: 'save rhel artifacts'
542547
variants: [rhel]
543548

544549
# NOTE (@imlucas) Examples of how to extend which tests run

‎.evergreen/preinstall.sh

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,6 @@ else
1515
export IS_UBUNTU=true
1616
fi
1717
fi
18-
# https://jira.mongodb.org/browse/COMPASS-4018
19-
# NPM_VERSION="latest"
20-
# TODO: lucas: Go back to npm@latest after 6.13.4 released
21-
# or https://jira.mongodb.org/browse/COMPASS-4019 removes jade.
22-
NPM_VERSION="6.13.2"
2318

2419
echo "========================="
2520
echo "Important Environment Variables"

‎.jsfmtrc

Lines changed: 0 additions & 168 deletions
This file was deleted.

‎.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ sudo: false
22
dist: trusty
33
language: node_js
44
node_js:
5-
- 10.2.1
5+
- 12.4.0
66
env:
77
matrix:
88
- MONGODB_VERSION=stable MONGODB_TOPOLOGY=standalone

0 commit comments

Comments
 (0)