Skip to content

Commit d51c0ef

Browse files
Merge remote-tracking branch 'origin/main' into beta-releases
2 parents baf3157 + 8bd6931 commit d51c0ef

File tree

52 files changed

+2044
-2045
lines changed

Some content is hidden

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

52 files changed

+2044
-2045
lines changed

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -516,6 +516,8 @@ tasks:
516516
- run-on-pr
517517
- assigned_to_jira_team_compass_compass
518518
- foliage_check_task_only
519+
# These tests are expensive (literally) and shouldn't be running on PRs
520+
patchable: false
519521
commands:
520522
- func: prepare
521523
- func: install

.evergreen/buildvariants-and-tasks.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1726,6 +1726,7 @@ tasks:
17261726
- run-on-pr
17271727
- assigned_to_jira_team_compass_compass
17281728
- foliage_check_task_only
1729+
patchable: false
17291730
commands:
17301731
- func: prepare
17311732
- func: install

.github/workflows/bump-packages.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848
- name: Create Pull Request
4949
uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f # 7.0.5
5050
with:
51-
token: ${{ secrets.SVC_DEVTOOLSBOT_TOKEN }} # TODO: replace with steps.app-token.outputs.token when it gets the PR permissions
51+
token: ${{ steps.app-token.outputs.token }}
5252
commit-message: "chore(release): bump package versions"
5353
branch: ci/bump-packages
5454
title: "chore(release): bump package versions"

.github/workflows/update-electron.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
- name: Create Pull Request
4242
uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f # 7.0.5
4343
with:
44-
token: ${{ secrets.SVC_DEVTOOLSBOT_TOKEN }} # TODO: replace with steps.app-token.outputs.token when it gets the PR permissions
44+
token: ${{ steps.app-token.outputs.token }}
4545
commit-message: "chore(deps): update electron"
4646
branch: ci/update-electron
4747
title: "chore(deps): update electron"

THIRD-PARTY-NOTICES.md

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

docs/tracking-plan.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
# Compass Tracking Plan
33

4-
Generated on Sun, Dec 1, 2024 at 03:28 AM
4+
Generated on Sun, Dec 8, 2024 at 03:24 AM
55

66
## Table of Contents
77

package-lock.json

Lines changed: 1721 additions & 1800 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/atlas-service/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,9 @@
7979
"@mongodb-js/compass-user-data": "^0.3.12",
8080
"@mongodb-js/compass-utils": "^0.6.16",
8181
"@mongodb-js/connection-info": "^0.9.5",
82-
"@mongodb-js/devtools-connect": "^3.3.1",
82+
"@mongodb-js/devtools-connect": "^3.3.3",
8383
"@mongodb-js/devtools-proxy-support": "^0.4.1",
84-
"@mongodb-js/oidc-plugin": "^1.1.1",
84+
"@mongodb-js/oidc-plugin": "^1.1.5",
8585
"hadron-app-registry": "^9.2.8",
8686
"compass-preferences-model": "^2.31.1",
8787
"electron": "^32.2.5",

packages/atlas-service/src/main.spec.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,11 @@ describe('CompassAuthServiceMain', function () {
331331
} as any;
332332
await CompassAuthService.init(preferences, {} as any);
333333
CompassAuthService['config'] = defaultConfig;
334-
expect(getListenerCount(logger)).to.eq(30);
334+
335+
// We expect that the oidc plugin registers a number of listeners
336+
// upon creation, which should get unregistered when we sign out.
337+
expect(getListenerCount(logger)).to.be.greaterThan(0);
338+
335339
// We did all preparations, reset sinon history for easier assertions
336340
sandbox.resetHistory();
337341

packages/bson-transpilers/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
},
4141
"dependencies": {
4242
"antlr4": "4.7.2",
43-
"bson": "^6.2.0",
43+
"bson": "^6.10.1",
4444
"js-yaml": "^3.13.1"
4545
},
4646
"bugs": {

0 commit comments

Comments
 (0)