Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 10 additions & 37 deletions .evergreen/buildvariants-and-tasks.in.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ const UNIT_TESTS_BUILD_VARIANTS = [
display_name: 'Unit Tests MacOS',
// We only have gui variants of the macos 15, so both unit tests will be
// running on it. We will not be running those on patches to save resources
run_on: 'macos-15-arm64-gui',
run_on: 'macos-15-arm64-gui',
run_on_prs: false,
}
];
Expand All @@ -47,13 +47,13 @@ const PACKAGE_BUILD_VARIANTS = [
{
name: 'package-macos-x64',
display_name: 'Package MacOS Intel',
run_on: 'macos-13',
run_on: 'macos-14',
target_platform: 'macos',
},
{
name: 'package-macos-arm',
display_name: 'Package MacOS Arm64',
run_on: 'macos-13-arm64',
run_on: 'macos-14-arm64',
target_platform: 'macos-arm',
}
];
Expand All @@ -78,15 +78,15 @@ const TEST_PACKAGED_APP_BUILD_VARIANTS = [
depends_on: 'package-rhel',
},
{
name: 'test-packaged-app-macos-11-arm',
display_name: 'MacOS arm64 11',
run_on: 'macos-11-arm64-gui',
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-11-x64',
display_name: 'MacOS x64 11',
run_on: 'macos-11-gui',
name: 'test-packaged-app-macos-14-x64',
display_name: 'MacOS x64 14',
run_on: 'macos-14-gui',
run_on_prs: false,
depends_on: 'package-macos-x64'
},
Expand Down Expand Up @@ -249,12 +249,8 @@ buildvariants:
variant: <%= buildVariant.depends_on %>
tasks:
<% for (const group of E2E_TEST_GROUPS) { %>
<% if (['test-packaged-app-macos-11-arm', 'test-packaged-app-macos-11-x64'].includes(buildVariant.name)) { %>
- name: test-packaged-app-macos-11-<%= group.number %>
<% } else { %>
- name: test-packaged-app-<%= group.number %>
<% } %>
<% } %>
<% } %>

- name: publish
Expand Down Expand Up @@ -560,30 +556,7 @@ tasks:
e2e_test_group: <%= group.number %>
debug: 'compass-e2e-tests*,electron*,hadron*,mongo*'

- name: test-packaged-app-macos-11-<%= group.number %>
tags:
- required-for-publish-desktop
- assigned_to_jira_team_compass_compass
- foliage_check_task_only
commands:
- func: prepare
- func: install
- func: bootstrap
vars:
scope: 'compass-e2e-tests'
- func: apply-compass-target-expansion
vars:
compass_distribution: compass
- func: get-packaged-app
vars:
compass_distribution: compass
- func: test-packaged-app
vars:
mongodb_version: 8.0.5
compass_distribution: compass
e2e_test_groups: <%= E2E_TEST_GROUPS.length %>
e2e_test_group: <%= group.number %>
debug: 'compass-e2e-tests*,electron*,hadron*,mongo*'

<% } %>

<% for (const browser of BROWSERS) { %>
Expand Down
100 changes: 14 additions & 86 deletions .evergreen/buildvariants-and-tasks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ buildvariants:
expansions:
target_platform: macos
display_name: Package MacOS Intel
run_on: macos-13
run_on: macos-14
tasks:
- name: package-compass
- name: package-compass-isolated
Expand All @@ -88,7 +88,7 @@ buildvariants:
expansions:
target_platform: macos-arm
display_name: Package MacOS Arm64
run_on: macos-13-arm64
run_on: macos-14-arm64
tasks:
- name: package-compass
- name: package-compass-isolated
Expand Down Expand Up @@ -211,28 +211,28 @@ buildvariants:
- name: test-packaged-app-1
- name: test-packaged-app-2
- name: test-packaged-app-3
- name: test-packaged-app-macos-11-arm
- name: test-packaged-app-macos-14-arm
tags:
- run-on-pr
display_name: Test Packaged App MacOS arm64 11
run_on: macos-11-arm64-gui
display_name: Test Packaged App MacOS arm64 14
run_on: macos-14-arm64-gui
depends_on:
- name: package-compass
variant: package-macos-arm
tasks:
- name: test-packaged-app-macos-11-1
- name: test-packaged-app-macos-11-2
- name: test-packaged-app-macos-11-3
- name: test-packaged-app-macos-11-x64
display_name: Test Packaged App MacOS x64 11
run_on: macos-11-gui
- 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
depends_on:
- name: package-compass
variant: package-macos-x64
tasks:
- name: test-packaged-app-macos-11-1
- name: test-packaged-app-macos-11-2
- name: test-packaged-app-macos-11-3
- name: test-packaged-app-1
- name: test-packaged-app-2
- name: test-packaged-app-3
- name: test-packaged-app-macos-15-arm
tags:
- run-on-pr
Expand Down Expand Up @@ -1025,30 +1025,6 @@ tasks:
e2e_test_groups: 3
e2e_test_group: 1
debug: compass-e2e-tests*,electron*,hadron*,mongo*
- name: test-packaged-app-macos-11-1
tags:
- required-for-publish-desktop
- assigned_to_jira_team_compass_compass
- foliage_check_task_only
commands:
- func: prepare
- func: install
- func: bootstrap
vars:
scope: compass-e2e-tests
- func: apply-compass-target-expansion
vars:
compass_distribution: compass
- func: get-packaged-app
vars:
compass_distribution: compass
- func: test-packaged-app
vars:
mongodb_version: 8.0.5
compass_distribution: compass
e2e_test_groups: 3
e2e_test_group: 1
debug: compass-e2e-tests*,electron*,hadron*,mongo*
- name: test-packaged-app-2
tags:
- required-for-publish-desktop
Expand All @@ -1073,30 +1049,6 @@ tasks:
e2e_test_groups: 3
e2e_test_group: 2
debug: compass-e2e-tests*,electron*,hadron*,mongo*
- name: test-packaged-app-macos-11-2
tags:
- required-for-publish-desktop
- assigned_to_jira_team_compass_compass
- foliage_check_task_only
commands:
- func: prepare
- func: install
- func: bootstrap
vars:
scope: compass-e2e-tests
- func: apply-compass-target-expansion
vars:
compass_distribution: compass
- func: get-packaged-app
vars:
compass_distribution: compass
- func: test-packaged-app
vars:
mongodb_version: 8.0.5
compass_distribution: compass
e2e_test_groups: 3
e2e_test_group: 2
debug: compass-e2e-tests*,electron*,hadron*,mongo*
- name: test-packaged-app-3
tags:
- required-for-publish-desktop
Expand All @@ -1121,30 +1073,6 @@ tasks:
e2e_test_groups: 3
e2e_test_group: 3
debug: compass-e2e-tests*,electron*,hadron*,mongo*
- name: test-packaged-app-macos-11-3
tags:
- required-for-publish-desktop
- assigned_to_jira_team_compass_compass
- foliage_check_task_only
commands:
- func: prepare
- func: install
- func: bootstrap
vars:
scope: compass-e2e-tests
- func: apply-compass-target-expansion
vars:
compass_distribution: compass
- func: get-packaged-app
vars:
compass_distribution: compass
- func: test-packaged-app
vars:
mongodb_version: 8.0.5
compass_distribution: compass
e2e_test_groups: 3
e2e_test_group: 3
debug: compass-e2e-tests*,electron*,hadron*,mongo*
- name: test-web-sandbox-chrome-1
tags:
- required-for-publish-web
Expand Down
2 changes: 1 addition & 1 deletion .evergreen/create-sbom.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ trap_handler() {
trap trap_handler ERR EXIT

# https://jira.mongodb.org/browse/MONGOSH-1856
cp -v node_modules/@mongosh/node-runtime-worker-thread/dist/purls.txt node-runtime-worker-thread-purls.txt
cp -v "$(npm ls @mongosh/node-runtime-worker-thread --parseable | head -1)/dist/purls.txt" node-runtime-worker-thread-purls.txt
scp -v -i "$SIGNING_SERVER_PRIVATE_KEY_CYGPATH" -P "$SIGNING_SERVER_PORT" \
.sbom/dependencies.json /tmp/artifactory_password node-runtime-worker-thread-purls.txt \
"$SIGNING_SERVER_USERNAME"@"$SIGNING_SERVER_HOSTNAME":/tmp/
Expand Down
4 changes: 2 additions & 2 deletions .evergreen/functions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ variables:
EVERGREEN_VERSION_ID: ${version_id}
EVERGREEN_WORKDIR: ${workdir}
EVERGREEN_CREATED_AT: ${created_at}
NODE_JS_VERSION: '22.21.1'
NODE_JS_VERSION: '24.14.0'
NPM_VERSION: '10.2.4'
# secrets
HADRON_METRICS_INTERCOM_APP_ID: ${metrics_intercom_app_id}
Expand Down Expand Up @@ -593,7 +593,7 @@ functions:
# Deploy to dev on every commit to main, do nothing for release branches
if [[ "$EVERGREEN_PROJECT" == '10gen-compass-main' && "$EVERGREEN_IS_PATCH" != "true" ]]; then
npm run --workspace @mongodb-js/compass-web upload-entrypoint
else
else
echo "Skipping publish: wrong project ($EVERGREEN_PROJECT) or patch ($EVERGREEN_IS_PATCH)"
fi

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/authors-and-third-party-notices.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:

- uses: actions/setup-node@v4
with:
node-version: 22.21.1
node-version: 24.14.0
cache: 'npm'

- name: Install npm@10.2.4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/bump-packages.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:

- uses: actions/setup-node@v4
with:
node-version: 22.21.1
node-version: 24.14.0
cache: 'npm'

- name: Install npm@10.2.4
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish-compass-web.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
- name: Setup Node.js environment
uses: actions/setup-node@v4
with:
node-version: 22.21.1
node-version: 24.14.0
cache: 'npm'

- name: Install npm@10.2.4
Expand Down Expand Up @@ -108,7 +108,7 @@ jobs:
- name: Setup Node.js environment
uses: actions/setup-node@v4
with:
node-version: 22.21.1
node-version: 24.14.0
cache: 'npm'

- name: Install npm@10.2.4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-compass.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
- name: Setup Node.js Environment
uses: actions/setup-node@v4
with:
node-version: 22.21.1
node-version: 24.14.0
cache: 'npm'

- name: Install npm@10.2.4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-packages.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
- name: 'Use Node.js'
uses: actions/setup-node@v4
with:
node-version: 22.21.1
node-version: 24.14.0

- name: Install npm@10.2.4
run: npm install -g npm@10.2.4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/start-beta.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:

- uses: actions/setup-node@v4
with:
node-version: 22.21.1
node-version: 24.14.0
cache: 'npm'

- name: Install npm@10.2.4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/start-ga.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:

- uses: actions/setup-node@v4
with:
node-version: 22.21.1
node-version: 24.14.0
cache: 'npm'

- name: Install npm@10.2.4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-installers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ jobs:
- name: Setup Node.js
uses: actions/setup-node@v4
with:
node-version: 22.21.1
node-version: 24.14.0
cache: 'npm'

- name: Cache downloads
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/update-dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ jobs:

- uses: actions/setup-node@v4
with:
node-version: 22.21.1
node-version: 24.14.0
cache: 'npm'

- name: Install npm@10.2.4
Expand Down Expand Up @@ -128,6 +128,6 @@ jobs:
your convenience.</p>

<p>If CI is red and you think that failures are related to the
version updates, you should raise an issue, so that it can be
version updates, you should raise an issue, so that it can be
manually resolved and we can continue to update the package group to
latest.</p>
2 changes: 1 addition & 1 deletion .tool-versions
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@

# This Node.js version matches the one required in
# the "engines" in the package.json.
nodejs 22.21.1
nodejs 24.14.0
4 changes: 2 additions & 2 deletions configs/webpack-config-compass/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -66,12 +66,12 @@
"@pmmmwh/react-refresh-webpack-plugin": "^0.5.15",
"babel-loader": "^8.2.5",
"babel-plugin-istanbul": "^5.2.0",
"browserslist": "^4.28.1",
"browserslist": "^4.28.2",
"chalk": "^4.1.2",
"cli-progress": "^3.9.1",
"core-js": "^3.49.0",
"css-loader": "^4.3.0",
"electron": "^37.10.3",
"electron": "^41.1.1",
"html-webpack-plugin": "^5.6.0",
"less": "^3.13.1",
"less-loader": "^10.0.1",
Expand Down
Loading
Loading