Skip to content

Commit 6ebb146

Browse files
github-actions[bot]github-actions[bot]
committed
Merge remote-tracking branch 'origin/main' into beta-releases
2 parents 42e97d3 + 67cb7b7 commit 6ebb146

File tree

52 files changed

+1561
-2719
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

+1561
-2719
lines changed

‎.depalignrc.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@
2626
],
2727
"js-yaml": [
2828
"^3.13.1"
29+
],
30+
"yargs": [
31+
"^4.8.1"
2932
]
3033
}
3134
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ const PACKAGE_BUILD_VARIANTS = [
2828
name: 'package-ubuntu',
2929
display_name: 'Package Ubuntu',
3030
31-
// # NOTE: We are packaging on Ubuntu 16.04 in order to use glibc 2.23
31+
// # NOTE: We are packaging on Ubuntu 18.04 in order to use glibc 2.27
3232
// # when compiling/re-building addons. This ensures compatibility with other
33-
// # debian platforms that have glibc 2.23 or newer.
34-
run_on: 'ubuntu1604-large',
33+
// # debian platforms that have glibc 2.27 or newer.
34+
run_on: 'ubuntu1804-large',
3535
silk_asset_group: 'compass-ubuntu',
3636
},
3737
{

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ buildvariants:
3535
expansions:
3636
silk_asset_group: compass-ubuntu
3737
display_name: Package Ubuntu
38-
run_on: ubuntu1604-large
38+
run_on: ubuntu1804-large
3939
tasks:
4040
- name: package-compass
4141
- name: package-compass-isolated

‎.evergreen/functions.yml‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -597,10 +597,9 @@ functions:
597597
DEBUG: ${debug|}
598598
MONGODB_VERSION: ${mongodb_version|}
599599
MONGODB_RUNNER_VERSION: ${mongodb_version|}
600-
E2E_TEST_GROUPS: ${e2e_test_groups}
601-
E2E_TEST_GROUP: ${e2e_test_group}
600+
COMPASS_E2E_TEST_GROUPS: ${e2e_test_groups}
601+
COMPASS_E2E_TEST_GROUP: ${e2e_test_group}
602602
ATLAS_LOCAL_VERSION: latest
603-
HADRON_DISTRIBUTION: compass
604603
script: |
605604
set -e
606605
# Load environment variables
@@ -629,8 +628,8 @@ functions:
629628
DEBUG: ${debug|}
630629
MONGODB_VERSION: ${mongodb_version|}
631630
MONGODB_RUNNER_VERSION: ${mongodb_version|}
632-
E2E_TEST_GROUPS: ${e2e_test_groups}
633-
E2E_TEST_GROUP: ${e2e_test_group}
631+
COMPASS_E2E_TEST_GROUPS: ${e2e_test_groups}
632+
COMPASS_E2E_TEST_GROUP: ${e2e_test_group}
634633
script: |
635634
set -e
636635
# Load environment variables
@@ -664,14 +663,14 @@ functions:
664663
DEBUG: ${debug|}
665664
MONGODB_VERSION: ${mongodb_version|}
666665
MONGODB_RUNNER_VERSION: ${mongodb_version|}
667-
COMPASS_WEB_BROWSER_NAME: ${browser_name}
668-
E2E_TEST_GROUPS: ${e2e_test_groups}
669-
E2E_TEST_GROUP: ${e2e_test_group}
666+
COMPASS_E2E_BROWSER_NAME: ${browser_name}
667+
COMPASS_E2E_TEST_GROUPS: ${e2e_test_groups}
668+
COMPASS_E2E_TEST_GROUP: ${e2e_test_group}
670669
script: |
671670
set -e
672671
# Load environment variables
673672
eval $(.evergreen/print-compass-env.sh)
674-
npm run --unsafe-perm --workspace compass-e2e-tests test-web
673+
npm run --unsafe-perm --workspace compass-e2e-tests test-ci web
675674
676675
test-connectivity:
677676
- command: shell.exec

‎.evergreen/print-compass-env.js‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ function printCompassEnv() {
7171
// To build node modules on linux post electron 13 we need a newer c++
7272
// compiler version and at least python v3.9, this adds it.
7373
// https://jira.mongodb.org/browse/COMPASS-5150
74-
pathsToPrepend.unshift('/opt/mongodbtoolchain/v3/bin');
74+
pathsToPrepend.unshift('/opt/mongodbtoolchain/v4/bin');
7575
}
7676

7777
PATH = maybePrependPaths(PATH, pathsToPrepend);
@@ -111,12 +111,8 @@ function printCompassEnv() {
111111
process.env.EVERGREEN_REVISION_ORDER_ID
112112
);
113113

114-
if (process.platform === 'darwin') {
115-
// Without this, kerberos 2.1.1 is broken on macOS, but this flag is only
116-
// really relevant for Linux.
117-
// https://jira.mongodb.org/browse/NODE-6320
118-
printVar('GYP_DEFINES', 'kerberos_use_rtld=false');
119-
}
114+
// https://jira.mongodb.org/browse/NODE-6320
115+
printVar('GYP_DEFINES', `kerberos_use_rtld=${process.platform === 'linux'}`);
120116
}
121117

122118
printCompassEnv();

‎.github/workflows/check-pr-title.yml‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
name: "Check PR Title"
2+
on:
3+
pull_request:
4+
types: [opened, synchronize, reopened, ready_for_review, labeled, unlabeled, converted_to_draft, edited]
5+
6+
jobs:
7+
check-pr-title:
8+
name: Check PR Title
9+
runs-on: ubuntu-latest
10+
steps:
11+
- name: Enforce conventional commit style
12+
uses: realm/ci-actions/title-checker@main
13+
with:
14+
regex: '^(build|chore|ci|docs|feat|fix|perf|refactor|revert|style|test|ops){1}(\([\w\-\.]+\))?(!)?: .*'
15+
error-hint: 'Invalid PR title. Make sure it follows the conventional commit specification (i.e. "<type>(<optional scope>): <description>") or add the no-title-validation label'
16+
ignore-labels: 'no-title-validation'
17+
- name: Enforce JIRA ticket in title
18+
uses: realm/ci-actions/title-checker@main
19+
# Skip the JIRA ticket check for PRs opened by bots
20+
if: ${{ !contains(github.event.pull_request.user.login, '[bot]') }}
21+
with:
22+
regex: '[A-Z]{4,10}-[0-9]{1,5}$'
23+
error-hint: 'Invalid PR title. Make sure it ends with a JIRA ticket - i.e. COMPASS-1234 or add the no-title-validation label'
24+
ignore-labels: 'no-title-validation'

‎AUTHORS‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,3 +93,4 @@ Kræn Hansen <[email protected]>
9393
Kræn Hansen <[email protected]>
9494
Ruchitha Rajaghatta <[email protected]>
9595
syn-zhu <[email protected]>
96+
Nikola Irinchev <[email protected]>

‎THIRD-PARTY-NOTICES.md‎

Lines changed: 10 additions & 10 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 Oct 27 2024.
2+
This document was automatically generated on Mon Oct 28 2024.
33

44
## List of dependencies
55

@@ -248,7 +248,7 @@ Package|Version|License
248248
**[ee-first](#e2746902c758ae8a6f91ffb9618cd53717f936cb33c6323e65b6b7b24f7ebefe)**|1.1.1|MIT
249249
**[electron-dl](#e97e034c7b93c63e7a433d75f6f1de3e0668764225ebbd61dbde8d1b55d6f3b7)**|3.5.0|MIT
250250
**[electron-squirrel-startup](#09fb8168e8fda2e174f8d1a1c392ffd8f762c5637c788edd00d1e2486d060349)**|1.0.1|Apache-2.0
251-
**[electron](#b8949aa8130b5ef5da1efc84f1a58e30028db62c230eb1da216dcfd7b263f55f)**|30.5.1|MIT
251+
**[electron](#4dac8b39331bcb6b30b99afe0849c00e3153935fcab1f1086622b9a2ccb4afc8)**|32.2.1|MIT
252252
**[encodeurl](#b89152db475e86531e570f87b45d8a51aa5e5d87d4cc3b960cee7b8febf1d26a)**|1.0.2|MIT
253253
**[encodeurl](#177948a319ae0aeebbd65742c53c62b37c75ec1d021afa5a188d10a7ceae6623)**|2.0.0|MIT
254254
**[end-of-stream](#fadc10994f5fa767d06fb25cfff35fb17a895daf3bc3477c782907668ed16563)**|1.4.4|MIT
@@ -476,8 +476,8 @@ Package|Version|License
476476
**[napi-build-utils](#26912b5ff7632f262d64273f99cd1a869376c5c378960e24501585e35b31054a)**|1.0.2|MIT
477477
**[negotiator](#e3856213d8f0a7d28cd4166e53ec7e2c019cb7becf4a8535097bac28d21e8579)**|0.6.3|MIT
478478
**[netmask](#2bd5b8ff7fab9adace6c38d3fd32e7328484939fdd07836635b0155d0afc35b2)**|2.0.2|MIT
479-
**[node-abi](#e95a83ce4ffe7621819fbbceed23c54f12e0e1066aad9e5b3093bbdc7c958e0b)**|3.68.0|MIT
480-
**[node-addon-api](#af9f7588524ca4e68f4efe7b24aea46d9c8004263b1d7cf3b558f86d87a163e8)**|4.3.0|MIT
479+
**[node-abi](#26b0c85ed4add770fa688d81ed25b3e4018a6114f488c70ab5b36b25cf4084d3)**|3.71.0|MIT
480+
**[node-addon-api](#75c2a47526765afc024a6641ec7b1b37935dc672a211ebdd9773d74bc43a95b4)**|6.1.0|MIT
481481
**[node-domexception](#3c25065fd2bc1b6b56856e30ac5b8f34ddae33ca87b225854f8d855b0ccabfbe)**|1.0.0|MIT
482482
**[node-fetch](#364527ef1b51cc6ac34872b931049c9e25b5014f9b40e3898c84e1a830e21720)**|2.6.7|MIT
483483
**[node-fetch](#23d7d5a419e9a25e6384dee4aa24f7162544418f0cdc2d92e94e2cf924507b8c)**|2.7.0|MIT
@@ -19215,8 +19215,8 @@ License files:
1921519215

1921619216

1921719217

19218-
<a id="b8949aa8130b5ef5da1efc84f1a58e30028db62c230eb1da216dcfd7b263f55f"></a>
19219-
### [electron](https://www.npmjs.com/package/electron) (version 30.5.1)
19218+
<a id="4dac8b39331bcb6b30b99afe0849c00e3153935fcab1f1086622b9a2ccb4afc8"></a>
19219+
### [electron](https://www.npmjs.com/package/electron) (version 32.2.1)
1922019220
License tags: MIT
1922119221

1922219222
License files:
@@ -28649,8 +28649,8 @@ License files:
2864928649
License tags: MIT
2865028650

2865128651

28652-
<a id="e95a83ce4ffe7621819fbbceed23c54f12e0e1066aad9e5b3093bbdc7c958e0b"></a>
28653-
### [node-abi](https://www.npmjs.com/package/node-abi) (version 3.68.0)
28652+
<a id="26b0c85ed4add770fa688d81ed25b3e4018a6114f488c70ab5b36b25cf4084d3"></a>
28653+
### [node-abi](https://www.npmjs.com/package/node-abi) (version 3.71.0)
2865428654
License tags: MIT
2865528655

2865628656
License files:
@@ -28680,8 +28680,8 @@ License files:
2868028680

2868128681

2868228682

28683-
<a id="af9f7588524ca4e68f4efe7b24aea46d9c8004263b1d7cf3b558f86d87a163e8"></a>
28684-
### [node-addon-api](https://www.npmjs.com/package/node-addon-api) (version 4.3.0)
28683+
<a id="75c2a47526765afc024a6641ec7b1b37935dc672a211ebdd9773d74bc43a95b4"></a>
28684+
### [node-addon-api](https://www.npmjs.com/package/node-addon-api) (version 6.1.0)
2868528685
License tags: MIT
2868628686

2868728687
License files:

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,12 +68,12 @@
6868
"@pmmmwh/react-refresh-webpack-plugin": "^0.5.15",
6969
"babel-loader": "^8.2.5",
7070
"babel-plugin-istanbul": "^5.2.0",
71-
"browserslist": "^4.24.0",
71+
"browserslist": "^4.24.2",
7272
"chalk": "^4.1.2",
7373
"cli-progress": "^3.9.1",
7474
"core-js": "^3.17.3",
7575
"css-loader": "^4.3.0",
76-
"electron": "^30.5.1",
76+
"electron": "^32.2.1",
7777
"html-webpack-plugin": "^5.6.0",
7878
"less": "^3.13.1",
7979
"less-loader": "^10.0.1",

‎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, Oct 27, 2024 at 03:16 AM
4+
Generated on Mon, Oct 28, 2024 at 06:47 PM
55

66
## Table of Contents
77

0 commit comments

Comments
 (0)