Skip to content

Commit 75ccb8b

Browse files
nvs119nvs119
committed
merge conflicts
2 parents 53375ce + 784662e commit 75ccb8b

File tree

218 files changed

+7949
-4157
lines changed

Some content is hidden

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

218 files changed

+7949
-4157
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ buildvariants:
245245
tasks:
246246
<% for (const group of E2E_TEST_GROUPS) { %>
247247
<% if (['test-packaged-app-macos-11-arm', 'test-packaged-app-macos-11-x64'].includes(buildVariant.name)) { %>
248-
- name: test-packaged-app-macos13-<%= group.number %>
248+
- name: test-packaged-app-macos-11-<%= group.number %>
249249
<% } else { %>
250250
- name: test-packaged-app-<%= group.number %>
251251
<% } %>
@@ -508,7 +508,7 @@ tasks:
508508
e2e_test_group: <%= group.number %>
509509
debug: 'compass-e2e-tests*,electron*,hadron*,mongo*'
510510

511-
- name: test-packaged-app-macos13-<%= group.number %>
511+
- name: test-packaged-app-macos-11-<%= group.number %>
512512
tags:
513513
- required-for-publish
514514
- run-on-pr

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -210,9 +210,9 @@ buildvariants:
210210
- name: package-compass
211211
variant: package-macos-arm
212212
tasks:
213-
- name: test-packaged-app-macos13-1
214-
- name: test-packaged-app-macos13-2
215-
- name: test-packaged-app-macos13-3
213+
- name: test-packaged-app-macos-11-1
214+
- name: test-packaged-app-macos-11-2
215+
- name: test-packaged-app-macos-11-3
216216
- name: test-packaged-app-macos-11-x64
217217
display_name: Test Packaged App MacOS x64 11
218218
run_on: macos-11-gui
@@ -221,9 +221,9 @@ buildvariants:
221221
- name: package-compass
222222
variant: package-macos-x64
223223
tasks:
224-
- name: test-packaged-app-macos13-1
225-
- name: test-packaged-app-macos13-2
226-
- name: test-packaged-app-macos13-3
224+
- name: test-packaged-app-macos-11-1
225+
- name: test-packaged-app-macos-11-2
226+
- name: test-packaged-app-macos-11-3
227227
- name: test-packaged-app-macos-14-arm
228228
display_name: Test Packaged App MacOS arm64 14
229229
run_on: macos-14-arm64-gui
@@ -1294,7 +1294,7 @@ tasks:
12941294
e2e_test_groups: 3
12951295
e2e_test_group: 1
12961296
debug: compass-e2e-tests*,electron*,hadron*,mongo*
1297-
- name: test-packaged-app-macos13-1
1297+
- name: test-packaged-app-macos-11-1
12981298
tags:
12991299
- required-for-publish
13001300
- run-on-pr
@@ -1344,7 +1344,7 @@ tasks:
13441344
e2e_test_groups: 3
13451345
e2e_test_group: 2
13461346
debug: compass-e2e-tests*,electron*,hadron*,mongo*
1347-
- name: test-packaged-app-macos13-2
1347+
- name: test-packaged-app-macos-11-2
13481348
tags:
13491349
- required-for-publish
13501350
- run-on-pr
@@ -1394,7 +1394,7 @@ tasks:
13941394
e2e_test_groups: 3
13951395
e2e_test_group: 3
13961396
debug: compass-e2e-tests*,electron*,hadron*,mongo*
1397-
- name: test-packaged-app-macos13-3
1397+
- name: test-packaged-app-macos-11-3
13981398
tags:
13991399
- required-for-publish
14001400
- run-on-pr

‎.evergreen/functions.yml‎

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -149,23 +149,11 @@ functions:
149149
<<: *compass-env
150150
script: |
151151
set -e
152-
eval $(.evergreen/print-compass-env.sh)
153-
154-
# Make all the dirs
155-
mkdir -p $ARTIFACTS_PATH
152+
.evergreen/install-node.sh
156153
157-
- command: shell.exec
158-
type: setup
159-
params:
160-
working_dir: src
161-
shell: bash
162-
env:
163-
<<: *compass-env
164-
script: |
165-
set -e
166154
eval $(.evergreen/print-compass-env.sh)
167155
168-
.evergreen/preinstall.sh
156+
.evergreen/print-debug-info.sh
169157
170158
# Make sure install worked
171159
echo "Using node version:";
@@ -747,8 +735,8 @@ functions:
747735
MCLI_PROJECT_ID: ${e2e_tests_mcli_project_id}
748736
MCLI_OPS_MANAGER_URL: ${e2e_tests_mcli_ops_manager_url}
749737
# CCS connection / op running time is slower than allowed timeouts
750-
COMPASS_E2E_MOCHA_TIMEOUT: '720000' # 12 min
751-
COMPASS_E2E_WEBDRIVER_WAITFOR_TIMEOUT: '360000' # 6 min
738+
COMPASS_E2E_MOCHA_TIMEOUT: '1440000' # 24 min
739+
COMPASS_E2E_WEBDRIVER_WAITFOR_TIMEOUT: '960000' # 16 min
752740
script: |
753741
set -e
754742
# Load environment variables

‎.evergreen/preinstall.sh‎ renamed to ‎.evergreen/install-node.sh‎

Lines changed: 4 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -2,30 +2,12 @@
22

33
set -e
44

5-
echo "========================="
6-
echo "Important Environment Variables"
7-
echo "========================="
8-
echo "PLATFORM: $PLATFORM"
9-
echo "ARCH: $ARCH"
10-
echo "NODE_JS_VERSION: $NODE_JS_VERSION"
11-
echo "NPM_VERSION: $NPM_VERSION"
12-
echo "APPDATA: $APPDATA"
13-
echo "PATH: $PATH"
14-
15-
# these are super useful if you want to run the smoke tests locally
16-
echo "export DEV_VERSION_IDENTIFIER=$DEV_VERSION_IDENTIFIER"
17-
echo "export EVERGREEN_BUCKET_KEY_PREFIX=$EVERGREEN_BUCKET_KEY_PREFIX"
18-
echo "export EVERGREEN_BUCKET_NAME=$EVERGREEN_BUCKET_NAME"
19-
20-
echo "IS_OSX: $IS_OSX"
21-
echo "IS_LINUX: $IS_LINUX"
22-
echo "IS_WINDOWS: $IS_WINDOWS"
23-
echo "IS_RHEL: $IS_RHEL"
24-
echo "IS_UBUNTU: $IS_UBUNTU"
5+
SCRIPTDIR="$(cd $(dirname "$0"); pwd)"
256

26-
echo "DOCKER_CONFIG: $DOCKER_CONFIG"
7+
source $SCRIPTDIR/set-platform-env.sh
278

28-
SCRIPTDIR="$(cd $(dirname "$0"); pwd)"
9+
# Ensure the .deps directory exists
10+
mkdir -p .deps
2911

3012
if [ -n "$IS_WINDOWS" ]; then
3113
echo "Installing nodejs v$NODE_JS_VERSION for windows..."

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

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#! /usr/bin/env node
21
'use strict';
3-
const path = require('path');
2+
const path = require('node:path');
3+
const fs = require('node:fs');
44

55
/*
66
This script writes a bash script that can be eval()'d in evergreen to modify the
@@ -84,7 +84,11 @@ function printCompassEnv() {
8484
// to be a non-cygwin path
8585
const npmCacheDir = path.resolve(__dirname, '..', '.deps', '.npm-cache');
8686

87-
printVar('ARTIFACTS_PATH', `${newPWD}/.deps`);
87+
const artifactsPath = path.resolve(newPWD, '.deps');
88+
if (!fs.existsSync(artifactsPath)) {
89+
fs.mkdirSync(artifactsPath, { recursive: true });
90+
}
91+
8892
printVar('NPM_CACHE_DIR', npmCacheDir);
8993

9094
// all npm var names need to be lowercase

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

Lines changed: 7 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -2,28 +2,7 @@
22

33
set -e
44

5-
if [[ $OSTYPE == "cygwin" ]]; then
6-
export PLATFORM='win32'
7-
export IS_WINDOWS=true
8-
export ARCH=x64
9-
elif [[ $(uname) == Darwin ]]; then
10-
export PLATFORM='darwin'
11-
export IS_OSX=true
12-
if [ `uname -m` = x86_64 ]; then
13-
export ARCH=x64
14-
else
15-
export ARCH=arm64
16-
fi
17-
else
18-
export PLATFORM='linux'
19-
export IS_LINUX=true
20-
export ARCH=x64
21-
if [[ $(cat /etc/*release | grep ^NAME | grep Red) ]]; then
22-
export IS_RHEL=true
23-
elif [[ $(cat /etc/*release | grep ^NAME | grep Ubuntu) ]]; then
24-
export IS_UBUNTU=true
25-
fi
26-
fi
5+
source .evergreen/set-platform-env.sh
276

287
export BASHPATH="$PATH"
298
export OSTYPE="$OSTYPE"
@@ -49,5 +28,9 @@ if [[ "${EVERGREEN_PROJECT}" == "10gen-compass-main" ]]; then
4928
fi
5029
fi
5130

52-
53-
.evergreen/print-compass-env.js
31+
# We cannot rely on node from the PATH, as the script we're calling is setting up that PATH.
32+
if [ -n "$IS_WINDOWS" ]; then
33+
.deps/node.exe .evergreen/print-compass-env.js
34+
else
35+
.deps/bin/node .evergreen/print-compass-env.js
36+
fi

‎.evergreen/print-debug-info.sh‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
#! /usr/bin/env bash
2+
3+
echo "========================="
4+
echo "Important Environment Variables"
5+
echo "========================="
6+
echo "PLATFORM: $PLATFORM"
7+
echo "ARCH: $ARCH"
8+
echo "NODE_JS_VERSION: $NODE_JS_VERSION"
9+
echo "NPM_VERSION: $NPM_VERSION"
10+
echo "APPDATA: $APPDATA"
11+
echo "PATH: $PATH"
12+
13+
# these are super useful if you want to run the smoke tests locally
14+
echo "export DEV_VERSION_IDENTIFIER=$DEV_VERSION_IDENTIFIER"
15+
echo "export EVERGREEN_BUCKET_KEY_PREFIX=$EVERGREEN_BUCKET_KEY_PREFIX"
16+
echo "export EVERGREEN_BUCKET_NAME=$EVERGREEN_BUCKET_NAME"
17+
18+
echo "IS_OSX: $IS_OSX"
19+
echo "IS_LINUX: $IS_LINUX"
20+
echo "IS_WINDOWS: $IS_WINDOWS"
21+
echo "IS_RHEL: $IS_RHEL"
22+
echo "IS_UBUNTU: $IS_UBUNTU"
23+
24+
echo "DOCKER_CONFIG: $DOCKER_CONFIG"

‎.evergreen/set-platform-env.sh‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
#! /usr/bin/env bash
2+
3+
if [[ $OSTYPE == "cygwin" ]]; then
4+
export PLATFORM='win32'
5+
export IS_WINDOWS=true
6+
export ARCH=x64
7+
elif [[ $(uname) == Darwin ]]; then
8+
export PLATFORM='darwin'
9+
export IS_OSX=true
10+
if [ `uname -m` = x86_64 ]; then
11+
export ARCH=x64
12+
else
13+
export ARCH=arm64
14+
fi
15+
else
16+
export PLATFORM='linux'
17+
export IS_LINUX=true
18+
export ARCH=x64
19+
if [[ $(cat /etc/*release | grep ^NAME | grep Red) ]]; then
20+
export IS_RHEL=true
21+
elif [[ $(cat /etc/*release | grep ^NAME | grep Ubuntu) ]]; then
22+
export IS_UBUNTU=true
23+
fi
24+
fi

‎AUTHORS‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,3 +108,5 @@ Raymond Lo <[email protected]>
108108
Moses Yang <[email protected]>
109109
Moses Yang <[email protected]>
110110
Jimmy Choi <[email protected]>
111+
Jacob Lu <[email protected]>
112+
Nataly Carbonell <[email protected]>

‎THIRD-PARTY-NOTICES.md‎

Lines changed: 13 additions & 13 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 Wed Jul 23 2025.
2+
This document was automatically generated on Wed Aug 13 2025.
33

44
## List of dependencies
55

@@ -228,7 +228,7 @@ This document was automatically generated on Wed Jul 23 2025.
228228
| **[dunder-proto](#390fd69f2035b583e461890d5b0a3230f4adb33b042e6f0d1472dd911bc1de98)** | 1.0.1 | MIT |
229229
| **[ee-first](#e2746902c758ae8a6f91ffb9618cd53717f936cb33c6323e65b6b7b24f7ebefe)** | 1.1.1 | MIT |
230230
| **[electron-dl](#e97e034c7b93c63e7a433d75f6f1de3e0668764225ebbd61dbde8d1b55d6f3b7)** | 3.5.0 | MIT |
231-
| **[electron](#13106dc4731439f2d21284fcd1e9f7363c38e0671b23818c0e3397fb780e6eac)** | 37.2.2 | MIT |
231+
| **[electron](#77028953dbf1c0658e7548098ee9c65eb010bf5a40354ff46424dd36f72bbc94)** | 37.2.6 | MIT |
232232
| **[encodeurl](#177948a319ae0aeebbd65742c53c62b37c75ec1d021afa5a188d10a7ceae6623)** | 2.0.0 | MIT |
233233
| **[end-of-stream](#fadc10994f5fa767d06fb25cfff35fb17a895daf3bc3477c782907668ed16563)** | 1.4.4 | MIT |
234234
| **[ensure-error](#3b1eba5276d89414cef21a1007e85c4f1d6749bf57b300e082ab23975a41dbc9)** | 3.0.1 | MIT |
@@ -303,7 +303,7 @@ This document was automatically generated on Wed Jul 23 2025.
303303
| **[is-utf8](#df5522c387e62effc17916c612bf340d6543c4bccca99fed4c1c1fae77ed4900)** | 0.2.1 | MIT |
304304
| **[is-wsl](#38b5685d9d35bd3f3dfc5cb892b9edef01eb8769b2cc19aad7e5807e304b7015)** | 3.1.0 | MIT |
305305
| **[javascript-stringify](#e0d27d21a288d227e51243715c044b3933d9fc0fb025dc16ec79c78af35f85a7)** | 2.1.0 | MIT |
306-
| **[jose](#458723a9e5f5f8cdac179e007d7874cbac5a617063510d9c6e4e4ec235e43ea8)** | 6.0.11 | MIT |
306+
| **[jose](#f9d2cbf414f008926ab4887a10cb2c34b1b205b42ce272c330e2eb0248071b7a)** | 6.0.12 | MIT |
307307
| **[js-tokens](#f4371f095c6f087cf41433031f8c612e21a4258b18cb4e847ffae73905e146d4)** | 4.0.0 | MIT |
308308
| **[js-yaml](#c82a34a38ab0debe302cf958caa7a51b455f5fb8a32a3ce6b9b4cab3f500c60a)** | 3.14.1 | MIT |
309309
| **[js-yaml](#b7325d630b0ab313450fcd188788f6ee374aadd75df4969a9e3c48507ef88bdf)** | 4.1.0 | MIT |
@@ -361,13 +361,13 @@ This document was automatically generated on Wed Jul 23 2025.
361361
| **[node-fetch](#22edb8ba3fe3457e8c1a02e497e6a8cb54e89775224f0c7680ea43772b5c1638)** | 3.3.2 | MIT |
362362
| **[numeral](#b3c90be596160f7dccbd1ff771ddbffb9a1b19d0bb9456553d8822903386573e)** | 1.5.6 | MIT |
363363
| **[numeral](#d274a180ad09fc1ae9325f01bf5dc1296caf553888d952fab7ebf524dfdc56a1)** | 2.0.6 | MIT |
364-
| **[oauth4webapi](#225b6b6709d0bebf556e68b486ddde16d898f1228bce49d9c5f3b3671b11f94e)** | 3.5.5 | MIT |
364+
| **[oauth4webapi](#20c210c3de969a4d06291b8bf773ce03262544409a28dac2ba63df67a1534827)** | 3.6.2 | MIT |
365365
| **[object-assign](#598e372231bb5bef26b7d61105282eb20e14ade430143052d064d2d406769b95)** | 4.1.1 | MIT |
366366
| **[object-inspect](#ecbef7226b7af9b6efde6c61e71aaefa8a0bf57a726689d055c866298db9886e)** | 1.13.4 | MIT |
367367
| **[on-finished](#d3c391e10faad1d82190a06f5be315d94a9194cff75aa389940432ef15cf45de)** | 2.4.1 | MIT |
368368
| **[once](#d0d1303998dfae04e4f898f477380aac35568f4d6679f4ea913c2441cf9ebb0b)** | 1.4.0 | ISC |
369369
| **[open](#adf67a26a7a19e515580af6636b13bbeb1df10fda82a82941a504e1be994a604)** | 10.1.2 | MIT |
370-
| **[openid-client](#c872797bd36f8e53bb75298134568c31c56cac936aadf5b4909ce5c554791187)** | 6.6.2 | MIT |
370+
| **[openid-client](#00df66b19cf3a8fdcd5bae5a38751e39685ed1f6986557e9d30b90917b9c768c)** | 6.6.3 | MIT |
371371
| **[os-dns-native](#ed8fb030877b8f0494551fd7f55288d885b2ddcece35dd7134434ad5c4c704de)** | 1.2.1 | MIT |
372372
| **[pac-proxy-agent](#751f2ba44d5fbf79ece4fea4bc03df4f4b3cb4470a1495adda33a28db3dd6d1f)** | 7.1.0 | MIT |
373373
| **[pac-resolver](#7935fe0839f6e2b7c51abcc08705a6096eff5670dc2bdc3819fd096b8d114d8b)** | 7.0.1 | MIT |
@@ -18618,9 +18618,9 @@ License files:
1861818618

1861918619
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
1862018620

18621-
<a id="13106dc4731439f2d21284fcd1e9f7363c38e0671b23818c0e3397fb780e6eac"></a>
18621+
<a id="77028953dbf1c0658e7548098ee9c65eb010bf5a40354ff46424dd36f72bbc94"></a>
1862218622

18623-
### [electron](https://www.npmjs.com/package/electron) (version 37.2.2)
18623+
### [electron](https://www.npmjs.com/package/electron) (version 37.2.6)
1862418624

1862518625
License tags: MIT
1862618626

@@ -21102,9 +21102,9 @@ License files:
2110221102
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
2110321103
THE SOFTWARE.
2110421104

21105-
<a id="458723a9e5f5f8cdac179e007d7874cbac5a617063510d9c6e4e4ec235e43ea8"></a>
21105+
<a id="f9d2cbf414f008926ab4887a10cb2c34b1b205b42ce272c330e2eb0248071b7a"></a>
2110621106

21107-
### [jose](https://www.npmjs.com/package/jose) (version 6.0.11)
21107+
### [jose](https://www.npmjs.com/package/jose) (version 6.0.12)
2110821108

2110921109
License tags: MIT
2111021110

@@ -24871,9 +24871,9 @@ License files:
2487124871
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
2487224872
OTHER DEALINGS IN THE SOFTWARE.
2487324873

24874-
<a id="225b6b6709d0bebf556e68b486ddde16d898f1228bce49d9c5f3b3671b11f94e"></a>
24874+
<a id="20c210c3de969a4d06291b8bf773ce03262544409a28dac2ba63df67a1534827"></a>
2487524875

24876-
### [oauth4webapi](https://www.npmjs.com/package/oauth4webapi) (version 3.5.5)
24876+
### [oauth4webapi](https://www.npmjs.com/package/oauth4webapi) (version 3.6.2)
2487724877

2487824878
License tags: MIT
2487924879

@@ -25047,9 +25047,9 @@ License files:
2504725047

2504825048
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
2504925049

25050-
<a id="c872797bd36f8e53bb75298134568c31c56cac936aadf5b4909ce5c554791187"></a>
25050+
<a id="00df66b19cf3a8fdcd5bae5a38751e39685ed1f6986557e9d30b90917b9c768c"></a>
2505125051

25052-
### [openid-client](https://www.npmjs.com/package/openid-client) (version 6.6.2)
25052+
### [openid-client](https://www.npmjs.com/package/openid-client) (version 6.6.3)
2505325053

2505425054
License tags: MIT
2505525055

0 commit comments

Comments
 (0)