Skip to content

COMPASS-3933: Update to Electron 6.0.11 #1873

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 22 commits into from
Jan 29, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
a7bcd7d
COMPASS-3933: Update to Electron 6.0.11
durran Dec 17, 2019
9a14c14
Merge branch 'master' into COMPASS-3933
imlucas Jan 6, 2020
5b5dc35
chore(ci): Update node version on travis and evergreen
imlucas Jan 6, 2020
9c62b8f
chore: Remove unused jsfmt config
imlucas Jan 6, 2020
b4e7fcc
hadron-build@23.0.2: ensure gnome-keyring is set as a requirement for…
lrlna Jan 13, 2020
f233a4b
Merge branch 'master' into COMPASS-3933
imlucas Jan 15, 2020
40c59ab
COMPASS-3917: keytar 5 upgrade
imlucas Jan 17, 2020
8b2c8bb
build(deps): COMPASS-3933: Update to latest connect and query history…
imlucas Jan 22, 2020
9557fcb
build(deps): COMPASS-3933 update compass-explain-plan
imlucas Jan 22, 2020
0cff77e
Merge branch 'master' into COMPASS-3933
imlucas Jan 22, 2020
4b66bcd
COMPASS-3933: Latest metrics and others
imlucas Jan 27, 2020
9caf84f
update dev deps
imlucas Jan 27, 2020
a94b816
remove dupe deps from compass-schema
imlucas Jan 27, 2020
18aad29
more extraneous deps
imlucas Jan 28, 2020
d083e78
:arrow_up: export to lang, crud, schema validation
imlucas Jan 28, 2020
5be7e88
latest language model
imlucas Jan 28, 2020
5971c4b
COMPASS-3933: latest agg plugin mongodb-js/compass-aggregations#120
imlucas Jan 28, 2020
2c70010
build(deps): source app-migrations from npm instead of github
imlucas Jan 29, 2020
f63bb30
build(deps): latest hadron*
imlucas Jan 29, 2020
ae52f14
build(deps): Update all mongodb* to latest
imlucas Jan 29, 2020
974db38
COMPASS-3933: latest crud
imlucas Jan 29, 2020
7f1947d
Merge branch 'master' into COMPASS-3933
imlucas Jan 29, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 33 additions & 28 deletions .evergreen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ post:
- ~/.mongodb/runner/*.log

functions:
"prepare":
'prepare':
- command: git.get_project
params:
directory: src
Expand Down Expand Up @@ -70,7 +70,12 @@ functions:
export NPM_TMP_DIR="$(pwd)/.deps/tmp"
export NPM_AUTH_TOKEN="${compass_npm_token}"

export NODE_JS_VERSION="10.2.1"
export NODE_JS_VERSION="12.4.0"
# TODO: lucas: Go back to npm@latest after 6.13.4 released
# or https://jira.mongodb.org/browse/COMPASS-4019 removes jade.
# https://jira.mongodb.org/browse/COMPASS-4018
# export NPM_VERSION="latest"
export NPM_VERSION="6.13.2"

if [[ "$OSTYPE" == "cygwin" ]]; then
export PATH="$(pwd)/.deps:/cygdrive/c/wixtools/bin/:$PATH"
Expand Down Expand Up @@ -213,7 +218,7 @@ functions:
# params:
# file: src/plugin/plugin-test-results.xml

"package":
'package':
- command: shell.exec
params:
working_dir: src
Expand Down Expand Up @@ -284,7 +289,7 @@ functions:
ls -la dist
fi

"publish":
'publish':
command: shell.exec
params:
working_dir: src
Expand All @@ -304,7 +309,7 @@ functions:
echo "Uploading release assets to S3 and GitHub if needed..."
npm run upload ${compass_distribution}

"save windows artifacts":
'save windows artifacts':
# setup
- <<: *save-artifact
params:
Expand Down Expand Up @@ -332,33 +337,33 @@ functions:
local_file: src/dist/${windows_nupkg_full_filename}
remote_file: ${project}/${revision}/${windows_nupkg_full_filename}

"save osx artifacts":
'save osx artifacts':
# .dmg
- <<: *save-artifact
params:
local_file: src/dist/${osx_dmg_filename}
remote_file: ${project}/${revision}/${osx_dmg_filename}
content_type: "application/x-apple-diskimage"
content_type: 'application/x-apple-diskimage'
# .zip
- <<: *save-artifact
params:
local_file: src/dist/${osx_zip_filename}
remote_file: ${project}/${revision}/${osx_zip_filename}
content_type: application/zip
"save linux artifacts":
'save linux artifacts':
# .deb
- <<: *save-artifact
params:
local_file: src/dist/${linux_deb_filename}
remote_file: ${project}/${revision}/${linux_deb_filename}
content_type: "application/vnd.debian.binary-package"
content_type: 'application/vnd.debian.binary-package'
# .tar.gz
- <<: *save-artifact
params:
local_file: src/dist/${linux_tar_filename}
remote_file: ${project}/${revision}/${linux_tar_filename}
content_type: application/x-gzip
"save rhel artifacts":
'save rhel artifacts':
# .rpm
- <<: *save-artifact
params:
Expand Down Expand Up @@ -386,28 +391,28 @@ tasks:
- func: publish
vars:
compass_distribution: compass
- func: "save osx artifacts"
- func: 'save osx artifacts'
- func: package
vars:
compass_distribution: compass-community
- func: publish
vars:
compass_distribution: compass-community
- func: "save osx artifacts"
- func: 'save osx artifacts'
- func: package
vars:
compass_distribution: compass-isolated
- func: publish
vars:
compass_distribution: compass-isolated
- func: "save osx artifacts"
- func: 'save osx artifacts'
- func: package
vars:
compass_distribution: compass-readonly
- func: publish
vars:
compass_distribution: compass-readonly
- func: "save osx artifacts"
- func: 'save osx artifacts'

- name: compile
depends_on: []
Expand All @@ -419,7 +424,7 @@ tasks:
- name: verify
depends_on: [compile]
tags:
- "verify"
- 'verify'
commands:
- func: restore
- func: verify
Expand All @@ -436,7 +441,7 @@ tasks:
- name: test-functional
depends_on: [compile]
tags:
- "test"
- 'test'
commands:
- func: restore
- func: test
Expand Down Expand Up @@ -477,17 +482,17 @@ tasks:
- func: publish
vars:
compass_distribution: compass
- func: "save windows artifacts"
- func: 'save windows artifacts'
variants: [windows]
# NOTE (@imlucas) Because macos can't utilize task parallelism
# and instead runs `oneshot-compile-test-package-publish`
# save osx artifacts doesn't apply here until we have more than
# 1 macos box setup to run functional tests.
# - func: 'save osx artifacts'
# variants: [macos]
- func: "save linux artifacts"
- func: 'save linux artifacts'
variants: [ubuntu]
- func: "save rhel artifacts"
- func: 'save rhel artifacts'
variants: [rhel]

- name: package-and-publish-compass-community
Expand All @@ -500,11 +505,11 @@ tasks:
- func: publish
vars:
compass_distribution: compass-community
- func: "save windows artifacts"
- func: 'save windows artifacts'
variants: [windows]
- func: "save linux artifacts"
- func: 'save linux artifacts'
variants: [ubuntu]
- func: "save rhel artifacts"
- func: 'save rhel artifacts'
variants: [rhel]

- name: package-and-publish-compass-isolated
Expand All @@ -517,11 +522,11 @@ tasks:
- func: publish
vars:
compass_distribution: compass-isolated
- func: "save windows artifacts"
- func: 'save windows artifacts'
variants: [windows]
- func: "save linux artifacts"
- func: 'save linux artifacts'
variants: [ubuntu]
- func: "save rhel artifacts"
- func: 'save rhel artifacts'
variants: [rhel]

- name: package-and-publish-compass-readonly
Expand All @@ -534,11 +539,11 @@ tasks:
- func: publish
vars:
compass_distribution: compass-readonly
- func: "save windows artifacts"
- func: 'save windows artifacts'
variants: [windows]
- func: "save linux artifacts"
- func: 'save linux artifacts'
variants: [ubuntu]
- func: "save rhel artifacts"
- func: 'save rhel artifacts'
variants: [rhel]

# NOTE (@imlucas) Examples of how to extend which tests run
Expand Down
5 changes: 0 additions & 5 deletions .evergreen/preinstall.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,6 @@ else
export IS_UBUNTU=true
fi
fi
# https://jira.mongodb.org/browse/COMPASS-4018
# NPM_VERSION="latest"
# TODO: lucas: Go back to npm@latest after 6.13.4 released
# or https://jira.mongodb.org/browse/COMPASS-4019 removes jade.
NPM_VERSION="6.13.2"

echo "========================="
echo "Important Environment Variables"
Expand Down
168 changes: 0 additions & 168 deletions .jsfmtrc

This file was deleted.

2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ sudo: false
dist: trusty
language: node_js
node_js:
- 10.2.1
- 12.4.0
env:
matrix:
- MONGODB_VERSION=stable MONGODB_TOPOLOGY=standalone
Expand Down
Loading