Skip to content

Commit 7b3a679

Browse files
Merge remote-tracking branch 'origin/main' into beta-releases
2 parents 9a95f3a + 106803c commit 7b3a679

File tree

150 files changed

+4867
-4633
lines changed

Some content is hidden

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

150 files changed

+4867
-4633
lines changed

.evergreen.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
stepback: false
22
exec_timeout_secs: 5400
33
ignore:
4+
- docs/**/*.md
45
- AUTHORS
6+
- CODE_OF_CONDUCT.md
7+
- CONTRIBUTING.md
8+
- README.md
59
- THIRD-PARTY-NOTICES.md
610
include:
711
- filename: .evergreen/functions.yml

.evergreen/buildvariants-and-tasks.in.yml

Lines changed: 6 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -67,13 +67,12 @@ const SMOKETEST_BUILD_VARIANTS = [
6767
// run_on: 'ubuntu2004-large',
6868
// depends_on: 'package-ubuntu',
6969
// },
70-
71-
// {
72-
// name: 'smoketest-windows',
73-
// display_name: 'Smoketest Windows',
74-
// run_on: 'windows-vsCurrent-large',
75-
// depends_on: 'package-windows',
76-
// },
70+
{
71+
name: 'smoketest-windows',
72+
display_name: 'Smoketest Windows',
73+
run_on: 'windows-vsCurrent-large',
74+
depends_on: 'package-windows',
75+
},
7776
// {
7877
// name: 'smoketest-rhel',
7978
// display_name: 'Smoketest RHEL',
@@ -288,7 +287,6 @@ buildvariants:
288287
run_on: ubuntu2004-large
289288
tasks:
290289
- name: publish
291-
- name: publish-packages-next
292290
- name: publish-dev-release-info
293291
- name: create_static_analysis_report
294292

@@ -430,17 +428,6 @@ tasks:
430428
- func: get-all-artifacts
431429
- func: publish
432430

433-
- name: publish-packages-next
434-
tags: []
435-
depends_on:
436-
- name: '.required-for-publish'
437-
variant: '*'
438-
commands:
439-
- func: prepare
440-
- func: install
441-
- func: bootstrap
442-
- func: publish-packages-next
443-
444431
- name: publish-dev-release-info
445432
tags: []
446433
depends_on:

.evergreen/buildvariants-and-tasks.yml

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,14 @@ buildvariants:
7676
- name: package-compass
7777
- name: package-compass-isolated
7878
- name: package-compass-readonly
79+
- name: smoketest-windows-compass
80+
display_name: Smoketest Windows (compass)
81+
run_on: windows-vsCurrent-large
82+
depends_on:
83+
- name: package-compass
84+
variant: package-windows
85+
tasks:
86+
- name: smoketest-compass
7987
- name: smoketest-macos-x64-compass
8088
display_name: Smoketest MacOS Intel (compass)
8189
run_on: macos-14-gui
@@ -243,7 +251,6 @@ buildvariants:
243251
run_on: ubuntu2004-large
244252
tasks:
245253
- name: publish
246-
- name: publish-packages-next
247254
- name: publish-dev-release-info
248255
- name: create_static_analysis_report
249256
- name: connectivity-tests
@@ -401,16 +408,6 @@ tasks:
401408
scope: mongodb-compass
402409
- func: get-all-artifacts
403410
- func: publish
404-
- name: publish-packages-next
405-
tags: []
406-
depends_on:
407-
- name: .required-for-publish
408-
variant: '*'
409-
commands:
410-
- func: prepare
411-
- func: install
412-
- func: bootstrap
413-
- func: publish-packages-next
414411
- name: publish-dev-release-info
415412
tags: []
416413
depends_on:

.evergreen/connectivity-tests/run.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ docker run \
2222
-e E2E_TESTS_FREE_TIER_HOST="${E2E_TESTS_FREE_TIER_HOST}" \
2323
-e E2E_TESTS_ATLAS_USERNAME="${E2E_TESTS_ATLAS_USERNAME}" \
2424
-e E2E_TESTS_ATLAS_PASSWORD="${E2E_TESTS_ATLAS_PASSWORD}" \
25-
-e E2E_TESTS_ATLAS_X509_PEM="${E2E_TESTS_ATLAS_X509_PEM}" \
25+
-e E2E_TESTS_ATLAS_X509_PEM_BASE64="${E2E_TESTS_ATLAS_X509_PEM_BASE64}" \
2626
-e MONGODB_VERSION="${MONGODB_VERSION}" \
2727
--add-host mongodb-kerberos-1.example.com:0.0.0.0 \
2828
--add-host mongodb-kerberos-2.example.com:0.0.0.0 \

.evergreen/functions.yml

Lines changed: 6 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ variables:
6262
E2E_TESTS_FREE_TIER_HOST: ${e2e_tests_free_tier_host}
6363
E2E_TESTS_ATLAS_USERNAME: ${e2e_tests_atlas_username}
6464
E2E_TESTS_ATLAS_PASSWORD: ${e2e_tests_atlas_password}
65-
E2E_TESTS_ATLAS_X509_PEM: ${e2e_tests_atlas_x509_pem}
65+
E2E_TESTS_ATLAS_X509_PEM_BASE64: ${e2e_tests_atlas_x509_pem_base64}
6666
E2E_TESTS_ATLAS_IAM_ACCESS_KEY_ID: ${e2e_tests_atlas_iam_aws_access_key_id}
6767
E2E_TESTS_ATLAS_IAM_SECRET_ACCESS_KEY: ${e2e_tests_atlas_iam_aws_secret_access_key}
6868
E2E_TESTS_ATLAS_IAM_TEMP_ROLE_ARN: ${e2e_tests_atlas_iam_temp_role_arn}
@@ -205,7 +205,7 @@ functions:
205205
# the output in a file that will be uploaded with rest of the logs
206206
LS_ALL_STDOUT_FILE="$(npm config get cache)/_logs/$(date -u +"%Y-%m-%dT%H_%M_%SZ")-npm-ls-all.log"
207207
echo "Validating dependencies with \`npm ls --all\`..."
208-
(npm ls --all > $LS_ALL_STDOUT_FILE && echo "No mismatched dependency versions") || echo "\nThe \`npm ls\` command failed with mismatched dependencies error. This usually means that the dependency versions listed in package.json are not matching dependencies resolved and recorded in package-lock.json. If you updated package.json files in your PR, inspect the error output and try to re-install offending dependncies to fix the package-lock file."
208+
(npm ls --all > $LS_ALL_STDOUT_FILE && echo "No mismatched dependency versions") || (echo "\nThe \`npm ls\` command failed with mismatched dependencies error. This usually means that the dependency versions listed in package.json are not matching dependencies resolved and recorded in package-lock.json. If you updated package.json files in your PR, inspect the error output and try to re-install offending dependncies to fix the package-lock file." && exit 1)
209209
210210
bootstrap:
211211
- command: shell.exec
@@ -678,17 +678,17 @@ functions:
678678
# Load environment variables
679679
eval $(.evergreen/print-compass-env.sh)
680680
681-
#if [[ "$IS_WINDOWS" == "true" ]]; then
681+
if [[ "$IS_WINDOWS" == "true" ]]; then
682682
# TODO: windows_setup
683683
# TODO: windows_msi
684-
# TODO: windows_zip
685-
#fi
684+
npm run --unsafe-perm --workspace @mongodb-js/compass-smoke-tests start -- --package=windows_zip
685+
fi
686686
687687
if [[ "$IS_OSX" == "true" ]]; then
688688
echo "Disabling clipboard usage in e2e tests (TODO: https://jira.mongodb.org/browse/BUILD-14780)"
689689
export COMPASS_E2E_DISABLE_CLIPBOARD_USAGE="true"
690690
npm run --unsafe-perm --workspace @mongodb-js/compass-smoke-tests start -- --package=osx_dmg
691-
# TODO: osx_zip
691+
npm run --unsafe-perm --workspace @mongodb-js/compass-smoke-tests start -- --package=osx_zip
692692
fi
693693
694694
#if [[ "$IS_UBUNTU" == "true" ]]; then
@@ -982,37 +982,6 @@ functions:
982982
echo "Downloading release assets from evergreen bucket..."
983983
npm run --workspace mongodb-compass download
984984
985-
generate-tasks:
986-
- command: generate.tasks
987-
params:
988-
files:
989-
- tasks.json
990-
991-
publish-packages-next:
992-
- command: shell.exec
993-
params:
994-
working_dir: src
995-
shell: bash
996-
env:
997-
<<: *compass-env
998-
NPM_TOKEN: ${devtoolsbot_npm_token}
999-
script: |
1000-
# Only package publish for commits on the main evergreen project.
1001-
if [[ "${requester}" == "commit" ]] && [[ "${project}" == "10gen-compass-main" ]]; then
1002-
set -e
1003-
# Load environment variables
1004-
eval $(.evergreen/print-compass-env.sh)
1005-
echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" >> .npmrc
1006-
npm config list
1007-
echo "Publishing packages as $(npm whoami)"
1008-
npm run version-packages-next
1009-
# unstage after lerna staged version
1010-
git reset
1011-
# mark files as unchanged so that lerna can publish
1012-
git update-index --assume-unchanged $(git diff --name-only HEAD)
1013-
bash ".evergreen/retry-with-backoff.sh" npm run publish-packages-next
1014-
fi
1015-
1016985
generate-vulnerability-report:
1017986
- command: shell.exec
1018987
params:

.github/workflows/bump-packages.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,5 +53,6 @@ jobs:
5353
branch: ci/bump-packages
5454
title: "chore(release): bump package versions"
5555
labels: no-title-validation
56+
author: "${{ steps.app-token.outputs.app-slug}}[bot] <${{ steps.app-token.outputs.app-email }}>"
5657
body: |
5758
- Bump package versions

.github/workflows/update-electron.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ name: Update electron
44
on:
55
workflow_dispatch:
66
schedule:
7-
- cron: "0 0 * * *"
7+
- cron: '0 0 * * *'
88

99
jobs:
1010
update_generated_files:
@@ -27,7 +27,7 @@ jobs:
2727
- uses: actions/setup-node@v4
2828
with:
2929
node-version: 20.16.0
30-
cache: "npm"
30+
cache: 'npm'
3131

3232
- name: Install [email protected]
3333
run: |
@@ -43,10 +43,10 @@ jobs:
4343
uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f # 7.0.5
4444
with:
4545
token: ${{ steps.app-token.outputs.token }}
46-
commit-message: "chore(deps): update electron"
46+
commit-message: 'chore(deps): update electron'
4747
branch: ci/update-electron
48-
title: "chore(deps): update electron"
48+
title: 'chore(deps): update electron'
4949
labels: no-title-validation
50+
author: '${{ steps.app-token.outputs.app-slug}}[bot] <${{ steps.app-token.outputs.app-email }}>'
5051
body: |
5152
- Update electron
52-
author: "${{ steps.app-token.outputs.app-slug }}[bot]"

AUTHORS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,3 +96,4 @@ syn-zhu <[email protected]>
9696
Nikola Irinchev <[email protected]>
9797
djechlin-mongodb <[email protected]>
9898
Dylan Richardson <[email protected]>
99+
Luke Wilson <[email protected]>

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 Jan 19 2025.
2+
This document was automatically generated on Sun Jan 26 2025.
33

44
## List of dependencies
55

@@ -243,7 +243,7 @@ Package|Version|License
243243
**[ee-first](#e2746902c758ae8a6f91ffb9618cd53717f936cb33c6323e65b6b7b24f7ebefe)**|1.1.1|MIT
244244
**[electron-dl](#e97e034c7b93c63e7a433d75f6f1de3e0668764225ebbd61dbde8d1b55d6f3b7)**|3.5.0|MIT
245245
**[electron-squirrel-startup](#09fb8168e8fda2e174f8d1a1c392ffd8f762c5637c788edd00d1e2486d060349)**|1.0.1|Apache-2.0
246-
**[electron](#9f5953883b0a4cf7dca3e1a6550c1df6f576de8080e3eb4e277a15f37fd13600)**|32.2.7|MIT
246+
**[electron](#0992113eaf3a301b6e966184dcd72bf81f03af0f1204de4590e721e622ea2d70)**|32.2.8|MIT
247247
**[encodeurl](#b89152db475e86531e570f87b45d8a51aa5e5d87d4cc3b960cee7b8febf1d26a)**|1.0.2|MIT
248248
**[encodeurl](#177948a319ae0aeebbd65742c53c62b37c75ec1d021afa5a188d10a7ceae6623)**|2.0.0|MIT
249249
**[end-of-stream](#fadc10994f5fa767d06fb25cfff35fb17a895daf3bc3477c782907668ed16563)**|1.4.4|MIT
@@ -448,7 +448,7 @@ Package|Version|License
448448
**[napi-build-utils](#26912b5ff7632f262d64273f99cd1a869376c5c378960e24501585e35b31054a)**|1.0.2|MIT
449449
**[negotiator](#e3856213d8f0a7d28cd4166e53ec7e2c019cb7becf4a8535097bac28d21e8579)**|0.6.3|MIT
450450
**[netmask](#2bd5b8ff7fab9adace6c38d3fd32e7328484939fdd07836635b0155d0afc35b2)**|2.0.2|MIT
451-
**[node-abi](#26b0c85ed4add770fa688d81ed25b3e4018a6114f488c70ab5b36b25cf4084d3)**|3.71.0|MIT
451+
**[node-abi](#d828b90b26e003401ce41aa4719bb6164ab1e897f15db9728e6871146a8197da)**|3.73.0|MIT
452452
**[node-addon-api](#75c2a47526765afc024a6641ec7b1b37935dc672a211ebdd9773d74bc43a95b4)**|6.1.0|MIT
453453
**[node-domexception](#3c25065fd2bc1b6b56856e30ac5b8f34ddae33ca87b225854f8d855b0ccabfbe)**|1.0.0|MIT
454454
**[node-fetch](#364527ef1b51cc6ac34872b931049c9e25b5014f9b40e3898c84e1a830e21720)**|2.6.7|MIT
@@ -18889,8 +18889,8 @@ License files:
1888918889

1889018890

1889118891

18892-
<a id="9f5953883b0a4cf7dca3e1a6550c1df6f576de8080e3eb4e277a15f37fd13600"></a>
18893-
### [electron](https://www.npmjs.com/package/electron) (version 32.2.7)
18892+
<a id="0992113eaf3a301b6e966184dcd72bf81f03af0f1204de4590e721e622ea2d70"></a>
18893+
### [electron](https://www.npmjs.com/package/electron) (version 32.2.8)
1889418894
License tags: MIT
1889518895

1889618896
License files:
@@ -27604,8 +27604,8 @@ License files:
2760427604
License tags: MIT
2760527605

2760627606

27607-
<a id="26b0c85ed4add770fa688d81ed25b3e4018a6114f488c70ab5b36b25cf4084d3"></a>
27608-
### [node-abi](https://www.npmjs.com/package/node-abi) (version 3.71.0)
27607+
<a id="d828b90b26e003401ce41aa4719bb6164ab1e897f15db9728e6871146a8197da"></a>
27608+
### [node-abi](https://www.npmjs.com/package/node-abi) (version 3.73.0)
2760927609
License tags: MIT
2761027610

2761127611
License files:

configs/eslint-config-compass/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@mongodb-js/eslint-config-compass",
3-
"version": "1.2.1",
3+
"version": "1.2.5",
44
"description": "Shared Compass eslint configuration",
55
"license": "SSPL",
66
"main": "index.js",
@@ -16,7 +16,7 @@
1616
"@babel/core": "^7.21.4",
1717
"@babel/eslint-parser": "^7.14.3",
1818
"@mongodb-js/eslint-config-devtools": "^0.9.9",
19-
"@mongodb-js/eslint-plugin-compass": "^1.1.1",
19+
"@mongodb-js/eslint-plugin-compass": "^1.1.5",
2020
"@typescript-eslint/eslint-plugin": "^5.59.0",
2121
"@typescript-eslint/parser": "^5.59.0",
2222
"eslint-config-prettier": "^8.3.0",

0 commit comments

Comments
 (0)