Skip to content

Commit 4b8216b

Browse files
github-actions[bot]github-actions[bot]
committed
Merge remote-tracking branch 'origin/main' into beta-releases
2 parents 8ffb5a6 + 9a9b2bb commit 4b8216b

Some content is hidden

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

54 files changed

+462
-278
lines changed

‎.evergreen/compass_package.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ if [[ "$OSTYPE" == "cygwin" ]]; then
88
fi
99

1010
echo "Creating signed release build..."
11-
npm run package-compass-nocompile $COMPASS_DISTRIBUTION
11+
npm run package-compass-nocompile
1212
npm run generate-first-party-deps-json
1313

1414
ls -la packages/compass/dist

‎.evergreen/functions.yml‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -301,12 +301,13 @@ functions:
301301
shell: bash
302302
env:
303303
<<: *compass-env
304+
HADRON_DISTRIBUTION: ${compass_distribution}
304305
script: |
305306
set -e
306307
# Load environment variables
307308
eval $(.evergreen/print-compass-env.sh)
308309
# Generates and expansion file with build target metadata in packages/compass/expansions.yml
309-
npm run --workspace mongodb-compass build-info -- ${target_platform} ${target_arch} --format=yaml --flatten ${compass_distribution} --out expansions.raw.yml
310+
npm run --workspace mongodb-compass build-info -- ${target_platform} ${target_arch} --format=yaml --flatten --out expansions.raw.yml
310311
# the 'author' key conflicts with evergreen's own expansion
311312
grep -v '^author:' < packages/compass/expansions.raw.yml > packages/compass/expansions.yml
312313
- command: expansions.update
@@ -405,7 +406,7 @@ functions:
405406
<<: *compass-env
406407
DEBUG: ${debug}
407408
npm_config_loglevel: ${npm_loglevel}
408-
COMPASS_DISTRIBUTION: ${compass_distribution}
409+
HADRON_DISTRIBUTION: ${compass_distribution}
409410
script: |
410411
set -e
411412
@@ -443,7 +444,7 @@ functions:
443444
<<: *compass-env
444445
DEBUG: ${debug}
445446
npm_config_loglevel: ${npm_loglevel}
446-
COMPASS_DISTRIBUTION: ${compass_distribution}
447+
HADRON_DISTRIBUTION: ${compass_distribution}
447448
SIGNING_SERVER_HOSTNAME: ${SIGNING_SERVER_HOSTNAME}
448449
SIGNING_SERVER_PRIVATE_KEY: ${SIGNING_SERVER_PRIVATE_KEY}
449450
SIGNING_SERVER_PRIVATE_KEY_CYGPATH: ${SIGNING_SERVER_PRIVATE_KEY_CYGPATH}
@@ -586,6 +587,7 @@ functions:
586587
E2E_TEST_GROUPS: ${e2e_test_groups}
587588
E2E_TEST_GROUP: ${e2e_test_group}
588589
ATLAS_LOCAL_VERSION: latest
590+
HADRON_DISTRIBUTION: compass
589591
script: |
590592
set -e
591593
# Load environment variables
@@ -614,6 +616,7 @@ functions:
614616
MONGODB_RUNNER_VERSION: ${mongodb_version|}
615617
E2E_TEST_GROUPS: ${e2e_test_groups}
616618
E2E_TEST_GROUP: ${e2e_test_group}
619+
HADRON_DISTRIBUTION: compass
617620
script: |
618621
set -e
619622
# Load environment variables
@@ -623,7 +626,6 @@ functions:
623626
624627
npm run --unsafe-perm --workspace compass-e2e-tests test-ci -- -- --test-multiple-connections
625628
626-
627629
test-packaged-app:
628630
- command: shell.exec
629631
# Fail the task if it's idle for 10 mins
@@ -946,6 +948,7 @@ functions:
946948
DEBUG: ${debug}
947949
SNYK_TOKEN: ${snyk_token}
948950
JIRA_API_TOKEN: ${jira_api_token}
951+
HADRON_DISTRIBUTION: compass
949952
script: |
950953
set -e
951954
# Load environment variables

‎.snyk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ignore:
77
reason: >-
88
Not applicable as we do not use a valueFormatter or cellRenderer
99
function
10-
expires: 2024-08-17T18:27:24.346Z
10+
expires: 2024-11-15T18:27:24.346Z
1111
created: 2024-01-18T18:27:24.353Z
1212
SNYK-JS-AXIOS-6032459:
1313
- '*':

‎CONTRIBUTING.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,10 @@ In addition to running lerna commands directly, there are a few convenient npm s
5656
To build compass you can run `package-compass` script:
5757

5858
```sh
59-
npm run package-compass
59+
HADRON_DISTRIBUTION='compass' npm run package-compass
6060
```
6161

62-
You can change the type of distribution you are building with `HADRON_DISTRIBUTION` environmental variable:
62+
It is required to provide `HADRON_DISTRIBUTION` env variable explicitly. You can change the type of distribution you are building by setting a different `HADRON_DISTRIBUTION` value:
6363

6464
```sh
6565
HADRON_DISTRIBUTION='compass-readonly' npm run package-compass

‎THIRD-PARTY-NOTICES.md‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
The following third-party software is used by and included in **Mongodb Compass**.
2-
This document was automatically generated on Sun Aug 18 2024.
2+
This document was automatically generated on Wed Aug 21 2024.
33

44
## List of dependencies
55

@@ -251,7 +251,7 @@ This document was automatically generated on Sun Aug 18 2024.
251251
| **[ee-first](#e2746902c758ae8a6f91ffb9618cd53717f936cb33c6323e65b6b7b24f7ebefe)** | 1.1.1 | MIT |
252252
| **[electron-dl](#e97e034c7b93c63e7a433d75f6f1de3e0668764225ebbd61dbde8d1b55d6f3b7)** | 3.5.0 | MIT |
253253
| **[electron-squirrel-startup](#09fb8168e8fda2e174f8d1a1c392ffd8f762c5637c788edd00d1e2486d060349)** | 1.0.1 | Apache-2.0 |
254-
| **[electron](#2d57f0e02aec4ac92532b06902fbe13af26292bde2d718c49f75a8fe02c85fdd)** | 29.4.5 | MIT |
254+
| **[electron](#a6c4259fce8f4193f5fead998cb489be8bcf7a128cc2af3e2291846a083855ce)** | 30.4.0 | MIT |
255255
| **[encodeurl](#b89152db475e86531e570f87b45d8a51aa5e5d87d4cc3b960cee7b8febf1d26a)** | 1.0.2 | MIT |
256256
| **[end-of-stream](#fadc10994f5fa767d06fb25cfff35fb17a895daf3bc3477c782907668ed16563)** | 1.4.4 | MIT |
257257
| **[ensure-error](#3b1eba5276d89414cef21a1007e85c4f1d6749bf57b300e082ab23975a41dbc9)** | 3.0.1 | MIT |
@@ -464,7 +464,7 @@ This document was automatically generated on Sun Aug 18 2024.
464464
| **[modify-filename](#7153be07939379ccf0072006c519fba2bdf5ab79ca8bb59bc5273f87a7bacbf6)** | 1.1.0 | MIT |
465465
| **[moment](#94975b5423311209f3beed9c2c6bb6157f622312a3f8563d507b52e804bf6285)** | 2.29.4 | MIT |
466466
| **[mongodb-build-info](#f0a98c22ae0766702726f79e058ac6dc4e4bead8557b67b816f40bd13fb54170)** | 1.7.2 | Apache-2.0 |
467-
| **[mongodb-client-encryption](#6e0ac1e457fd6c68a4a91ede36be521cd2cf275fc1748e1f3b540e2ccd3b2791)** | 6.0.0 | Apache-2.0 |
467+
| **[mongodb-client-encryption](#42ba122fc0db7791e33e6160aff7213f42c4a34a8e891e78cd07c606555c2bb9)** | 6.0.1 | Apache-2.0 |
468468
| **[mongodb-cloud-info](#a784f3b401cf51746f49964e044db933529b3e3791e557702715730f5a3f1e46)** | 2.1.2 | Apache-2.0 |
469469
| **[mongodb-connection-string-url](#2e1146256a89ebd24e3398881e03807fe363d58444e6b7952ea50bd6108707bc)** | 3.0.1 | Apache-2.0 |
470470
| **[mongodb-log-writer](#c4945018f8490fc8e56e1414e262fcf1b802800e05cd15f2bd6b7a9d0b94af85)** | 1.4.2 | Apache-2.0 |
@@ -19655,9 +19655,9 @@ License files:
1965519655
See the License for the specific language governing permissions and
1965619656
limitations under the License.
1965719657

19658-
<a id="2d57f0e02aec4ac92532b06902fbe13af26292bde2d718c49f75a8fe02c85fdd"></a>
19658+
<a id="a6c4259fce8f4193f5fead998cb489be8bcf7a128cc2af3e2291846a083855ce"></a>
1965919659

19660-
### [electron](https://www.npmjs.com/package/electron) (version 29.4.5)
19660+
### [electron](https://www.npmjs.com/package/electron) (version 30.4.0)
1966119661

1966219662
License tags: MIT
1966319663

@@ -27449,9 +27449,9 @@ License files:
2744927449
See the License for the specific language governing permissions and
2745027450
limitations under the License.
2745127451

27452-
<a id="6e0ac1e457fd6c68a4a91ede36be521cd2cf275fc1748e1f3b540e2ccd3b2791"></a>
27452+
<a id="42ba122fc0db7791e33e6160aff7213f42c4a34a8e891e78cd07c606555c2bb9"></a>
2745327453

27454-
### [mongodb-client-encryption](https://www.npmjs.com/package/mongodb-client-encryption) (version 6.0.0)
27454+
### [mongodb-client-encryption](https://www.npmjs.com/package/mongodb-client-encryption) (version 6.0.1)
2745527455

2745627456
License tags: Apache-2.0
2745727457

‎configs/webpack-config-compass/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
"cli-progress": "^3.9.1",
7575
"core-js": "^3.17.3",
7676
"css-loader": "^4.3.0",
77-
"electron": "^29.4.5",
77+
"electron": "^30.4.0",
7878
"html-webpack-plugin": "^5.3.2",
7979
"less": "^3.13.1",
8080
"less-loader": "^10.0.1",

0 commit comments

Comments
 (0)