Skip to content

Commit b1e7144

Browse files
Merge remote-tracking branch 'origin/beta-releases' into ga-releases
2 parents b71cbf2 + 0a09bef commit b1e7144

File tree

193 files changed

+11656
-8242
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

193 files changed

+11656
-8242
lines changed

.evergreen/functions.yml

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,34 @@ post:
9393
- src/.evergreen/logs/*
9494
remote_file: ${project}/${revision}_${revision_order_id}/${build_variant}/${task_name}
9595
content_type: text/plain
96+
- command: s3.put
97+
params:
98+
<<: *save-artifact-params-private
99+
local_file: src/.sbom/dependencies.json
100+
remote_file: ${project}/${revision}_${revision_order_id}/dependencies.json
101+
content_type: application/json
102+
optional: true
103+
- command: s3.put
104+
params:
105+
<<: *save-artifact-params-private
106+
local_file: src/.sbom/snyk-test-result.json
107+
remote_file: ${project}/${revision}_${revision_order_id}/snyk-test-result.json
108+
content_type: application/json
109+
optional: true
110+
- command: s3.put
111+
params:
112+
<<: *save-artifact-params-private
113+
local_file: src/.sbom/snyk-test-result.html
114+
remote_file: ${project}/${revision}_${revision_order_id}/snyk-test-result.html
115+
content_type: text/html
116+
optional: true
117+
- command: s3.put
118+
params:
119+
<<: *save-artifact-params-private
120+
local_file: src/.sbom/vulnerability-report.md
121+
remote_file: ${project}/${revision}_${revision_order_id}/vulnerability-report.md
122+
content_type: text/markdown
123+
optional: true
96124
- command: attach.results
97125
params:
98126
file_location: src/packages/compass-e2e-tests/.log/report.json
@@ -614,31 +642,3 @@ functions:
614642
if [[ "$EVERGREEN_IS_PATCH" != "true" ]]; then
615643
exit $return_code
616644
fi
617-
- command: s3.put
618-
params:
619-
<<: *save-artifact-params-private
620-
local_file: src/.sbom/dependencies.json
621-
remote_file: ${project}/${revision}_${revision_order_id}/dependencies.json
622-
content_type: application/json
623-
optional: true
624-
- command: s3.put
625-
params:
626-
<<: *save-artifact-params-private
627-
local_file: src/.sbom/snyk-test-result.json
628-
remote_file: ${project}/${revision}_${revision_order_id}/snyk-test-result.json
629-
content_type: application/json
630-
optional: true
631-
- command: s3.put
632-
params:
633-
<<: *save-artifact-params-private
634-
local_file: src/.sbom/snyk-test-result.html
635-
remote_file: ${project}/${revision}_${revision_order_id}/snyk-test-result.html
636-
content_type: text/html
637-
optional: true
638-
- command: s3.put
639-
params:
640-
<<: *save-artifact-params-private
641-
local_file: src/.sbom/vulnerability-report.md
642-
remote_file: ${project}/${revision}_${revision_order_id}/vulnerability-report.md
643-
content_type: text/markdown
644-
optional: true

AUTHORS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,3 +76,4 @@ MrKrrot <[email protected]>
7676
Prashant Thakur <[email protected]>
7777
Kevin Mas Ruiz <[email protected]>
7878
Taveesh Anand <[email protected]>
79+
Hinson Chan <[email protected]>

README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ Is there anything else you’d like to see in Compass? Let us know by submitting
5959
- [**@mongodb-js/mongodb-notary-service-client**](packages/notary-service-client): A client for our notary-service: an API for codesigning
6060
- [**@mongodb-js/mongodb-redux-common**](packages/redux-common): Common Redux Modules for mongodb-js
6161
- [**@mongodb-js/ssh-tunnel**](packages/ssh-tunnel): Yet another ssh tunnel based on ssh2
62-
- [**app-migrations**](packages/app-migrations): Helper for application schema migrations
6362
- [**bson-transpilers**](packages/bson-transpilers): Source to source compilers using ANTLR
6463
- [**compass-e2e-tests**](packages/compass-e2e-tests): E2E test suite for Compass app that follows smoke tests / feature testing matrix
6564
- [**compass-preferences-model**](packages/compass-preferences-model): Compass preferences model

THIRD-PARTY-NOTICES.md

Lines changed: 68 additions & 16 deletions
Large diffs are not rendered by default.

configs/webpack-config-compass/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"email": "[email protected]"
1414
},
1515
"homepage": "https://github.com/mongodb-js/compass",
16-
"version": "1.2.0",
16+
"version": "1.2.2",
1717
"repository": {
1818
"type": "git",
1919
"url": "https://github.com/mongodb-js/compass.git"
@@ -69,17 +69,17 @@
6969
"@pmmmwh/react-refresh-webpack-plugin": "^0.5.5",
7070
"babel-loader": "^8.2.5",
7171
"babel-plugin-istanbul": "^5.2.0",
72-
"browserslist": "^4.21.11",
72+
"browserslist": "^4.22.1",
7373
"chalk": "^4.1.2",
7474
"cli-progress": "^3.9.1",
7575
"core-js": "^3.17.3",
7676
"css-loader": "^4.3.0",
77-
"electron": "^26.2.2",
77+
"electron": "^25.8.4",
7878
"html-webpack-plugin": "^5.3.2",
7979
"less-loader": "^10.0.1",
8080
"mini-css-extract-plugin": "^2.3.0",
8181
"node-loader": "^2.0.0",
82-
"postcss": "^8.3.6",
82+
"postcss": "^8.4.31",
8383
"postcss-loader": "^6.1.1",
8484
"postcss-preset-env": "^6.7.0",
8585
"react-refresh": "^0.10.0",

0 commit comments

Comments
 (0)