Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/beta-releases' into ga-releases
Browse files Browse the repository at this point in the history
  • Loading branch information
github-actions[bot] committed Oct 11, 2024
2 parents 852a64d + ee6a5bc commit fb85887
Show file tree
Hide file tree
Showing 381 changed files with 34,542 additions and 32,342 deletions.
33 changes: 23 additions & 10 deletions .evergreen/buildvariants-and-tasks.in.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,48 +49,61 @@ const PACKAGE_BUILD_VARIANTS = [
{
name: 'package-macos-x64',
display_name: 'Package MacOS Intel',
run_on: 'macos-1100',
run_on: 'macos-14',
silk_asset_group: 'compass-macos',
},
{
name: 'package-macos-arm',
display_name: 'Package MacOS Arm64',
run_on: 'macos-1100-arm64',
run_on: 'macos-14-arm64',
silk_asset_group: 'compass-macos-arm',
}
];
const TEST_PACKAGED_APP_BUILD_VARIANTS = [
{
name: 'test-server-ubuntu',
name: 'test-packaged-app-ubuntu',
display_name: 'Ubuntu 20.04',
run_on: 'ubuntu2004-large',
depends_on: 'package-ubuntu',
},
{
name: 'test-server-windows',
name: 'test-packaged-app-windows',
display_name: 'Windows 10',
run_on: 'windows-vsCurrent-large',
depends_on: 'package-windows',
},
{
name: 'test-server-rhel',
name: 'test-packaged-app-rhel',
display_name: 'RHEL 8.0',
run_on: 'rhel80-large',
depends_on: 'package-rhel',
},
{
name: 'test-server-macos-11-arm',
name: 'test-packaged-app-macos-11-arm',
display_name: 'MacOS arm64 11',
run_on: 'macos-1100-arm64-gui',
depends_on: 'package-macos-arm'
},
{
name: 'test-server-macos-11-x64',
name: 'test-packaged-app-macos-11-x64',
display_name: 'MacOS x64 11',
run_on: 'macos-1100-gui',
patchable: false,
depends_on: 'package-macos-x64'
},
{
name: 'test-packaged-app-macos-14-arm',
display_name: 'MacOS arm64 14',
run_on: 'macos-14-arm64-gui',
depends_on: 'package-macos-arm'
},
{
name: 'test-packaged-app-macos-14-x64',
display_name: 'MacOS x64 14',
run_on: 'macos-14-gui',
patchable: false,
depends_on: 'package-macos-x64'
}
];
Expand All @@ -110,8 +123,8 @@ const MAINTAINED_SERVER_VERSIONS = [
{ name: '60x-enterprise', version: '6.0.x-enterprise' },
{ name: '70x-community', version: '7.0.x' },
{ name: '70x-enterprise', version: '7.0.x-enterprise' },
{ name: '80x-community', version: '8.0.0-rc18' },
{ name: '80x-enterprise', version: '8.0.0-rc18-enterprise' },
{ name: '80x-community', version: '8.0.x' },
{ name: '80x-enterprise', version: '8.0.x-enterprise' },
];
const TEST_LATEST_ALPHA_SERVER_VERSION = { name: 'latest-alpha', version: 'latest-alpha-enterprise' };
Expand Down Expand Up @@ -281,7 +294,7 @@ tasks:
- func: check

- name: test
tags:
tags:
- required-for-publish
- run-on-pr
- assigned_to_jira_team_compass_compass
Expand Down
48 changes: 35 additions & 13 deletions .evergreen/buildvariants-and-tasks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ buildvariants:
expansions:
silk_asset_group: compass-macos
display_name: Package MacOS Intel
run_on: macos-1100
run_on: macos-14
tasks:
- name: package-compass
- name: package-compass-isolated
Expand All @@ -71,7 +71,7 @@ buildvariants:
expansions:
silk_asset_group: compass-macos-arm
display_name: Package MacOS Arm64
run_on: macos-1100-arm64
run_on: macos-14-arm64
tasks:
- name: package-compass
- name: package-compass-isolated
Expand Down Expand Up @@ -145,7 +145,7 @@ buildvariants:
- name: test-server-latest-alpha-1
- name: test-server-latest-alpha-2
- name: test-server-latest-alpha-3
- name: test-server-ubuntu
- name: test-packaged-app-ubuntu
display_name: Test Packaged App Ubuntu 20.04
run_on: ubuntu2004-large
patchable: true
Expand All @@ -156,7 +156,7 @@ buildvariants:
- name: test-packaged-app-1
- name: test-packaged-app-2
- name: test-packaged-app-3
- name: test-server-windows
- name: test-packaged-app-windows
display_name: Test Packaged App Windows 10
run_on: windows-vsCurrent-large
patchable: true
Expand All @@ -167,7 +167,7 @@ buildvariants:
- name: test-packaged-app-1
- name: test-packaged-app-2
- name: test-packaged-app-3
- name: test-server-rhel
- name: test-packaged-app-rhel
display_name: Test Packaged App RHEL 8.0
run_on: rhel80-large
patchable: true
Expand All @@ -178,7 +178,7 @@ buildvariants:
- name: test-packaged-app-1
- name: test-packaged-app-2
- name: test-packaged-app-3
- name: test-server-macos-11-arm
- name: test-packaged-app-macos-11-arm
display_name: Test Packaged App MacOS arm64 11
run_on: macos-1100-arm64-gui
patchable: true
Expand All @@ -189,7 +189,7 @@ buildvariants:
- name: test-packaged-app-1
- name: test-packaged-app-2
- name: test-packaged-app-3
- name: test-server-macos-11-x64
- name: test-packaged-app-macos-11-x64
display_name: Test Packaged App MacOS x64 11
run_on: macos-1100-gui
patchable: false
Expand All @@ -200,6 +200,28 @@ buildvariants:
- name: test-packaged-app-1
- name: test-packaged-app-2
- name: test-packaged-app-3
- name: test-packaged-app-macos-14-arm
display_name: Test Packaged App MacOS arm64 14
run_on: macos-14-arm64-gui
patchable: true
depends_on:
- name: package-compass
variant: package-macos-arm
tasks:
- name: test-packaged-app-1
- name: test-packaged-app-2
- name: test-packaged-app-3
- name: test-packaged-app-macos-14-x64
display_name: Test Packaged App MacOS x64 14
run_on: macos-14-gui
patchable: false
depends_on:
- name: package-compass
variant: package-macos-x64
tasks:
- name: test-packaged-app-1
- name: test-packaged-app-2
- name: test-packaged-app-3
- name: publish
display_name: Publish Artifacts
run_on: ubuntu2004-large
Expand Down Expand Up @@ -1291,7 +1313,7 @@ tasks:
compass_distribution: compass
- func: test-packaged-app
vars:
mongodb_version: 8.0.0-rc18
mongodb_version: 8.0.x
compass_distribution: compass
e2e_test_groups: 3
e2e_test_group: 1
Expand All @@ -1314,7 +1336,7 @@ tasks:
compass_distribution: compass
- func: test-packaged-app
vars:
mongodb_version: 8.0.0-rc18
mongodb_version: 8.0.x
compass_distribution: compass
e2e_test_groups: 3
e2e_test_group: 2
Expand All @@ -1337,7 +1359,7 @@ tasks:
compass_distribution: compass
- func: test-packaged-app
vars:
mongodb_version: 8.0.0-rc18
mongodb_version: 8.0.x
compass_distribution: compass
e2e_test_groups: 3
e2e_test_group: 3
Expand All @@ -1360,7 +1382,7 @@ tasks:
compass_distribution: compass
- func: test-packaged-app
vars:
mongodb_version: 8.0.0-rc18-enterprise
mongodb_version: 8.0.x-enterprise
compass_distribution: compass
e2e_test_groups: 3
e2e_test_group: 1
Expand All @@ -1383,7 +1405,7 @@ tasks:
compass_distribution: compass
- func: test-packaged-app
vars:
mongodb_version: 8.0.0-rc18-enterprise
mongodb_version: 8.0.x-enterprise
compass_distribution: compass
e2e_test_groups: 3
e2e_test_group: 2
Expand All @@ -1406,7 +1428,7 @@ tasks:
compass_distribution: compass
- func: test-packaged-app
vars:
mongodb_version: 8.0.0-rc18-enterprise
mongodb_version: 8.0.x-enterprise
compass_distribution: compass
e2e_test_groups: 3
e2e_test_group: 3
Expand Down
12 changes: 6 additions & 6 deletions .evergreen/functions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -81,12 +81,12 @@ variables:

# This is here with the variables because anchors aren't supported across includes
post:
- command: shell.exec
- command: archive.targz_pack
params:
working_dir: src
shell: bash
script: |
tar czf all-e2e-logs.tgz packages/compass-e2e-tests/.log
target: src/all-e2e-logs.tgz
source_dir: src/packages/compass-e2e-tests/.log
include:
- "**"
- command: s3.put
params:
<<: *save-artifact-params-private
Expand Down Expand Up @@ -699,7 +699,7 @@ functions:
eval $(.evergreen/print-compass-env.sh)
rm -rf mongodb-crypt && mkdir -p mongodb-crypt
(cd mongodb-crypt && \
curl -sSfL $(npx -y mongodb-download-url --enterprise --crypt_shared --version '>= 8.0.0-rc18') | \
curl -sSfL $(npx -y mongodb-download-url --enterprise --crypt_shared --version continuous) | \
tar -xvz)
export COMPASS_CRYPT_LIBRARY_PATH=$(echo $PWD/mongodb-crypt/lib/mongo_*_v1.*)
npm run test-csfle --workspace mongodb-data-service
Expand Down
1 change: 1 addition & 0 deletions AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -90,3 +90,4 @@ Betsy Button <[email protected]>
Vivian Xiao <[email protected]>
admin-token-bot <[email protected]>
Kræn Hansen <[email protected]>
Kræn Hansen <[email protected]>
6 changes: 5 additions & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ This repository includes a few recommended plugins for your convenience:
- ESLint extension highlights possible issues in your code following our common eslint configuration.
- ANTLR4 grammar support extension helps to work with the `bson-transpilers` package that is implemented with the help of antlr (.g and .g4 files).

## Enabling DevTools
## Enabling Chrome DevTools

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>).

Expand Down Expand Up @@ -149,3 +149,7 @@ The root cause is native modules compiled for a different version of the runtime
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.

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.

### The React Developer Tools extension is not working?

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.
Loading

0 comments on commit fb85887

Please sign in to comment.