Skip to content

Commit fb85887

Browse files
Merge remote-tracking branch 'origin/beta-releases' into ga-releases
2 parents 852a64d + ee6a5bc commit fb85887

File tree

381 files changed

+34542
-32342
lines changed

Some content is hidden

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

381 files changed

+34542
-32342
lines changed

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

Lines changed: 23 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -49,48 +49,61 @@ const PACKAGE_BUILD_VARIANTS = [
4949
{
5050
name: 'package-macos-x64',
5151
display_name: 'Package MacOS Intel',
52-
run_on: 'macos-1100',
52+
run_on: 'macos-14',
5353
silk_asset_group: 'compass-macos',
5454
},
5555
{
5656
name: 'package-macos-arm',
5757
display_name: 'Package MacOS Arm64',
58-
run_on: 'macos-1100-arm64',
58+
run_on: 'macos-14-arm64',
5959
silk_asset_group: 'compass-macos-arm',
6060
}
6161
];
6262
6363
const TEST_PACKAGED_APP_BUILD_VARIANTS = [
6464
{
65-
name: 'test-server-ubuntu',
65+
name: 'test-packaged-app-ubuntu',
6666
display_name: 'Ubuntu 20.04',
6767
run_on: 'ubuntu2004-large',
6868
depends_on: 'package-ubuntu',
6969
},
7070
{
71-
name: 'test-server-windows',
71+
name: 'test-packaged-app-windows',
7272
display_name: 'Windows 10',
7373
run_on: 'windows-vsCurrent-large',
7474
depends_on: 'package-windows',
7575
},
7676
{
77-
name: 'test-server-rhel',
77+
name: 'test-packaged-app-rhel',
7878
display_name: 'RHEL 8.0',
7979
run_on: 'rhel80-large',
8080
depends_on: 'package-rhel',
8181
},
8282
{
83-
name: 'test-server-macos-11-arm',
83+
name: 'test-packaged-app-macos-11-arm',
8484
display_name: 'MacOS arm64 11',
8585
run_on: 'macos-1100-arm64-gui',
8686
depends_on: 'package-macos-arm'
8787
},
8888
{
89-
name: 'test-server-macos-11-x64',
89+
name: 'test-packaged-app-macos-11-x64',
9090
display_name: 'MacOS x64 11',
9191
run_on: 'macos-1100-gui',
9292
patchable: false,
9393
depends_on: 'package-macos-x64'
94+
},
95+
{
96+
name: 'test-packaged-app-macos-14-arm',
97+
display_name: 'MacOS arm64 14',
98+
run_on: 'macos-14-arm64-gui',
99+
depends_on: 'package-macos-arm'
100+
},
101+
{
102+
name: 'test-packaged-app-macos-14-x64',
103+
display_name: 'MacOS x64 14',
104+
run_on: 'macos-14-gui',
105+
patchable: false,
106+
depends_on: 'package-macos-x64'
94107
}
95108
];
96109
@@ -110,8 +123,8 @@ const MAINTAINED_SERVER_VERSIONS = [
110123
{ name: '60x-enterprise', version: '6.0.x-enterprise' },
111124
{ name: '70x-community', version: '7.0.x' },
112125
{ name: '70x-enterprise', version: '7.0.x-enterprise' },
113-
{ name: '80x-community', version: '8.0.0-rc18' },
114-
{ name: '80x-enterprise', version: '8.0.0-rc18-enterprise' },
126+
{ name: '80x-community', version: '8.0.x' },
127+
{ name: '80x-enterprise', version: '8.0.x-enterprise' },
115128
];
116129
117130
const TEST_LATEST_ALPHA_SERVER_VERSION = { name: 'latest-alpha', version: 'latest-alpha-enterprise' };
@@ -281,7 +294,7 @@ tasks:
281294
- func: check
282295

283296
- name: test
284-
tags:
297+
tags:
285298
- required-for-publish
286299
- run-on-pr
287300
- assigned_to_jira_team_compass_compass

.evergreen/buildvariants-and-tasks.yml

Lines changed: 35 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ buildvariants:
6262
expansions:
6363
silk_asset_group: compass-macos
6464
display_name: Package MacOS Intel
65-
run_on: macos-1100
65+
run_on: macos-14
6666
tasks:
6767
- name: package-compass
6868
- name: package-compass-isolated
@@ -71,7 +71,7 @@ buildvariants:
7171
expansions:
7272
silk_asset_group: compass-macos-arm
7373
display_name: Package MacOS Arm64
74-
run_on: macos-1100-arm64
74+
run_on: macos-14-arm64
7575
tasks:
7676
- name: package-compass
7777
- name: package-compass-isolated
@@ -145,7 +145,7 @@ buildvariants:
145145
- name: test-server-latest-alpha-1
146146
- name: test-server-latest-alpha-2
147147
- name: test-server-latest-alpha-3
148-
- name: test-server-ubuntu
148+
- name: test-packaged-app-ubuntu
149149
display_name: Test Packaged App Ubuntu 20.04
150150
run_on: ubuntu2004-large
151151
patchable: true
@@ -156,7 +156,7 @@ buildvariants:
156156
- name: test-packaged-app-1
157157
- name: test-packaged-app-2
158158
- name: test-packaged-app-3
159-
- name: test-server-windows
159+
- name: test-packaged-app-windows
160160
display_name: Test Packaged App Windows 10
161161
run_on: windows-vsCurrent-large
162162
patchable: true
@@ -167,7 +167,7 @@ buildvariants:
167167
- name: test-packaged-app-1
168168
- name: test-packaged-app-2
169169
- name: test-packaged-app-3
170-
- name: test-server-rhel
170+
- name: test-packaged-app-rhel
171171
display_name: Test Packaged App RHEL 8.0
172172
run_on: rhel80-large
173173
patchable: true
@@ -178,7 +178,7 @@ buildvariants:
178178
- name: test-packaged-app-1
179179
- name: test-packaged-app-2
180180
- name: test-packaged-app-3
181-
- name: test-server-macos-11-arm
181+
- name: test-packaged-app-macos-11-arm
182182
display_name: Test Packaged App MacOS arm64 11
183183
run_on: macos-1100-arm64-gui
184184
patchable: true
@@ -189,7 +189,7 @@ buildvariants:
189189
- name: test-packaged-app-1
190190
- name: test-packaged-app-2
191191
- name: test-packaged-app-3
192-
- name: test-server-macos-11-x64
192+
- name: test-packaged-app-macos-11-x64
193193
display_name: Test Packaged App MacOS x64 11
194194
run_on: macos-1100-gui
195195
patchable: false
@@ -200,6 +200,28 @@ buildvariants:
200200
- name: test-packaged-app-1
201201
- name: test-packaged-app-2
202202
- name: test-packaged-app-3
203+
- name: test-packaged-app-macos-14-arm
204+
display_name: Test Packaged App MacOS arm64 14
205+
run_on: macos-14-arm64-gui
206+
patchable: true
207+
depends_on:
208+
- name: package-compass
209+
variant: package-macos-arm
210+
tasks:
211+
- name: test-packaged-app-1
212+
- name: test-packaged-app-2
213+
- name: test-packaged-app-3
214+
- name: test-packaged-app-macos-14-x64
215+
display_name: Test Packaged App MacOS x64 14
216+
run_on: macos-14-gui
217+
patchable: false
218+
depends_on:
219+
- name: package-compass
220+
variant: package-macos-x64
221+
tasks:
222+
- name: test-packaged-app-1
223+
- name: test-packaged-app-2
224+
- name: test-packaged-app-3
203225
- name: publish
204226
display_name: Publish Artifacts
205227
run_on: ubuntu2004-large
@@ -1291,7 +1313,7 @@ tasks:
12911313
compass_distribution: compass
12921314
- func: test-packaged-app
12931315
vars:
1294-
mongodb_version: 8.0.0-rc18
1316+
mongodb_version: 8.0.x
12951317
compass_distribution: compass
12961318
e2e_test_groups: 3
12971319
e2e_test_group: 1
@@ -1314,7 +1336,7 @@ tasks:
13141336
compass_distribution: compass
13151337
- func: test-packaged-app
13161338
vars:
1317-
mongodb_version: 8.0.0-rc18
1339+
mongodb_version: 8.0.x
13181340
compass_distribution: compass
13191341
e2e_test_groups: 3
13201342
e2e_test_group: 2
@@ -1337,7 +1359,7 @@ tasks:
13371359
compass_distribution: compass
13381360
- func: test-packaged-app
13391361
vars:
1340-
mongodb_version: 8.0.0-rc18
1362+
mongodb_version: 8.0.x
13411363
compass_distribution: compass
13421364
e2e_test_groups: 3
13431365
e2e_test_group: 3
@@ -1360,7 +1382,7 @@ tasks:
13601382
compass_distribution: compass
13611383
- func: test-packaged-app
13621384
vars:
1363-
mongodb_version: 8.0.0-rc18-enterprise
1385+
mongodb_version: 8.0.x-enterprise
13641386
compass_distribution: compass
13651387
e2e_test_groups: 3
13661388
e2e_test_group: 1
@@ -1383,7 +1405,7 @@ tasks:
13831405
compass_distribution: compass
13841406
- func: test-packaged-app
13851407
vars:
1386-
mongodb_version: 8.0.0-rc18-enterprise
1408+
mongodb_version: 8.0.x-enterprise
13871409
compass_distribution: compass
13881410
e2e_test_groups: 3
13891411
e2e_test_group: 2
@@ -1406,7 +1428,7 @@ tasks:
14061428
compass_distribution: compass
14071429
- func: test-packaged-app
14081430
vars:
1409-
mongodb_version: 8.0.0-rc18-enterprise
1431+
mongodb_version: 8.0.x-enterprise
14101432
compass_distribution: compass
14111433
e2e_test_groups: 3
14121434
e2e_test_group: 3

.evergreen/functions.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -81,12 +81,12 @@ variables:
8181

8282
# This is here with the variables because anchors aren't supported across includes
8383
post:
84-
- command: shell.exec
84+
- command: archive.targz_pack
8585
params:
86-
working_dir: src
87-
shell: bash
88-
script: |
89-
tar czf all-e2e-logs.tgz packages/compass-e2e-tests/.log
86+
target: src/all-e2e-logs.tgz
87+
source_dir: src/packages/compass-e2e-tests/.log
88+
include:
89+
- "**"
9090
- command: s3.put
9191
params:
9292
<<: *save-artifact-params-private
@@ -699,7 +699,7 @@ functions:
699699
eval $(.evergreen/print-compass-env.sh)
700700
rm -rf mongodb-crypt && mkdir -p mongodb-crypt
701701
(cd mongodb-crypt && \
702-
curl -sSfL $(npx -y mongodb-download-url --enterprise --crypt_shared --version '>= 8.0.0-rc18') | \
702+
curl -sSfL $(npx -y mongodb-download-url --enterprise --crypt_shared --version continuous) | \
703703
tar -xvz)
704704
export COMPASS_CRYPT_LIBRARY_PATH=$(echo $PWD/mongodb-crypt/lib/mongo_*_v1.*)
705705
npm run test-csfle --workspace mongodb-data-service

AUTHORS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,3 +90,4 @@ Betsy Button <[email protected]>
9090
Vivian Xiao <[email protected]>
9191
admin-token-bot <[email protected]>
9292
Kræn Hansen <[email protected]>
93+
Kræn Hansen <[email protected]>

CONTRIBUTING.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ This repository includes a few recommended plugins for your convenience:
3535
- ESLint extension highlights possible issues in your code following our common eslint configuration.
3636
- ANTLR4 grammar support extension helps to work with the `bson-transpilers` package that is implemented with the help of antlr (.g and .g4 files).
3737

38-
## Enabling DevTools
38+
## Enabling Chrome DevTools
3939

4040
To enable the Chrome DevTools for the Electron renderer processes, click "Settings" under "MongoDB Compass Dev Local" in the top menu (or press <kbd>⌘</kbd> + <kbd>,</kbd>) and click "Enable DevTools" followed by "Save", which will enable a "Toggle DevTools" item in the "View" top menu. Click this to toggle the DevTools panel (or press <kbd>⌥</kbd> + <kbd>⌘</kbd> + <kbd>I</kbd>).
4141

@@ -149,3 +149,7 @@ The root cause is native modules compiled for a different version of the runtime
149149
This means that if you e.g., start Compass application locally it will recompile all native modules to work in Electron runtime, if you would try to run tests for `@mongodb-js/connection-storage` library right after that, tests would fail due to `keytar` library not being compatible with Node.js environment that the tests are running in.
150150

151151
If you run into this issue, make sure that native modules are rebuilt for whatever runtime you are planning to use at the moment. To help with that we provide two npm scripts: `npm run electron-rebuild` will recompile native modules to work with Electron and `npm run node-rebuild` will recompile them to work with Node.js.
152+
153+
### The React Developer Tools extension is not working?
154+
155+
To inspect the React component hierarchies in the Chrome DevTools panel, use the [React Developer Tools](https://chromewebstore.google.com/detail/react-developer-tools/fmkadmapgofadopljbjfkapdkoienihi), which is already installed when running a local development build. For a reason, yet to be determined, you must reload (<kbd>⌘</kbd> + <kbd>R</kbd>) the DevTools window to see the "⚛️ Components" and "⚛️ Profiler" tabs.

0 commit comments

Comments
 (0)