Skip to content

Commit 1782287

Browse files
committed
Merge branch 'main' into download-released-compass
2 parents 07c5ad0 + 5fc97c6 commit 1782287

File tree

139 files changed

+2579
-2916
lines changed

Some content is hidden

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

139 files changed

+2579
-2916
lines changed

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

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -67,13 +67,12 @@ const SMOKETEST_BUILD_VARIANTS = [
6767
// run_on: 'ubuntu2004-large',
6868
// depends_on: 'package-ubuntu',
6969
// },
70-
71-
// {
72-
// name: 'smoketest-windows',
73-
// display_name: 'Smoketest Windows',
74-
// run_on: 'windows-vsCurrent-large',
75-
// depends_on: 'package-windows',
76-
// },
70+
{
71+
name: 'smoketest-windows',
72+
display_name: 'Smoketest Windows',
73+
run_on: 'windows-vsCurrent-large',
74+
depends_on: 'package-windows',
75+
},
7776
// {
7877
// name: 'smoketest-rhel',
7978
// display_name: 'Smoketest RHEL',

.evergreen/buildvariants-and-tasks.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,14 @@ buildvariants:
7676
- name: package-compass
7777
- name: package-compass-isolated
7878
- name: package-compass-readonly
79+
- name: smoketest-windows-compass
80+
display_name: Smoketest Windows (compass)
81+
run_on: windows-vsCurrent-large
82+
depends_on:
83+
- name: package-compass
84+
variant: package-windows
85+
tasks:
86+
- name: smoketest-compass
7987
- name: smoketest-macos-x64-compass
8088
display_name: Smoketest MacOS Intel (compass)
8189
run_on: macos-14-gui

.evergreen/functions.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -678,17 +678,17 @@ functions:
678678
# Load environment variables
679679
eval $(.evergreen/print-compass-env.sh)
680680
681-
#if [[ "$IS_WINDOWS" == "true" ]]; then
681+
if [[ "$IS_WINDOWS" == "true" ]]; then
682682
# TODO: windows_setup
683683
# TODO: windows_msi
684-
# TODO: windows_zip
685-
#fi
684+
npm run --unsafe-perm --workspace @mongodb-js/compass-smoke-tests start -- --package=windows_zip
685+
fi
686686
687687
if [[ "$IS_OSX" == "true" ]]; then
688688
echo "Disabling clipboard usage in e2e tests (TODO: https://jira.mongodb.org/browse/BUILD-14780)"
689689
export COMPASS_E2E_DISABLE_CLIPBOARD_USAGE="true"
690690
npm run --unsafe-perm --workspace @mongodb-js/compass-smoke-tests start -- --package=osx_dmg
691-
# TODO: osx_zip
691+
npm run --unsafe-perm --workspace @mongodb-js/compass-smoke-tests start -- --package=osx_zip
692692
fi
693693
694694
#if [[ "$IS_UBUNTU" == "true" ]]; then

.github/workflows/update-electron.yaml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ name: Update electron
44
on:
55
workflow_dispatch:
66
schedule:
7-
- cron: "0 0 * * *"
7+
- cron: '0 0 * * *'
88

99
jobs:
1010
update_generated_files:
@@ -27,7 +27,7 @@ jobs:
2727
- uses: actions/setup-node@v4
2828
with:
2929
node-version: 20.16.0
30-
cache: "npm"
30+
cache: 'npm'
3131

3232
- name: Install [email protected]
3333
run: |
@@ -43,10 +43,9 @@ jobs:
4343
uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f # 7.0.5
4444
with:
4545
token: ${{ steps.app-token.outputs.token }}
46-
commit-message: "chore(deps): update electron"
46+
commit-message: 'chore(deps): update electron'
4747
branch: ci/update-electron
48-
title: "chore(deps): update electron"
48+
title: 'chore(deps): update electron'
4949
labels: no-title-validation
5050
body: |
5151
- Update electron
52-
author: "${{ steps.app-token.outputs.app-slug }}[bot]"

AUTHORS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,3 +96,4 @@ syn-zhu <[email protected]>
9696
Nikola Irinchev <[email protected]>
9797
djechlin-mongodb <[email protected]>
9898
Dylan Richardson <[email protected]>
99+
Luke Wilson <[email protected]>

THIRD-PARTY-NOTICES.md

Lines changed: 1 addition & 1 deletion
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 Tue Jan 21 2025.
2+
This document was automatically generated on Wed Jan 22 2025.
33

44
## List of dependencies
55

configs/eslint-config-compass/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@mongodb-js/eslint-config-compass",
3-
"version": "1.2.1",
3+
"version": "1.2.2",
44
"description": "Shared Compass eslint configuration",
55
"license": "SSPL",
66
"main": "index.js",
@@ -16,7 +16,7 @@
1616
"@babel/core": "^7.21.4",
1717
"@babel/eslint-parser": "^7.14.3",
1818
"@mongodb-js/eslint-config-devtools": "^0.9.9",
19-
"@mongodb-js/eslint-plugin-compass": "^1.1.1",
19+
"@mongodb-js/eslint-plugin-compass": "^1.1.2",
2020
"@typescript-eslint/eslint-plugin": "^5.59.0",
2121
"@typescript-eslint/parser": "^5.59.0",
2222
"eslint-config-prettier": "^8.3.0",

configs/eslint-plugin-compass/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"email": "[email protected]"
1414
},
1515
"homepage": "https://github.com/mongodb-js/compass",
16-
"version": "1.1.1",
16+
"version": "1.1.2",
1717
"repository": {
1818
"type": "git",
1919
"url": "https://github.com/mongodb-js/compass.git"
@@ -37,8 +37,8 @@
3737
"reformat": "npm run eslint . -- --fix && npm run prettier -- --write ."
3838
},
3939
"devDependencies": {
40-
"@mongodb-js/mocha-config-compass": "^1.5.1",
41-
"@mongodb-js/prettier-config-compass": "^1.1.1",
40+
"@mongodb-js/mocha-config-compass": "^1.5.2",
41+
"@mongodb-js/prettier-config-compass": "^1.1.2",
4242
"depcheck": "^1.4.1",
4343
"eslint": "^7.25.0",
4444
"mocha": "^10.2.0",

configs/mocha-config-compass/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
22
"name": "@mongodb-js/mocha-config-compass",
3-
"version": "1.5.1",
3+
"version": "1.5.2",
44
"description": "Shared mocha mocha configuration for Compass packages",
55
"license": "SSPL",
66
"main": "index.js",
77
"devDependencies": {
8-
"@mongodb-js/prettier-config-compass": "^1.1.1",
8+
"@mongodb-js/prettier-config-compass": "^1.1.2",
99
"prettier": "^2.7.1"
1010
},
1111
"scripts": {

configs/prettier-config-compass/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@mongodb-js/prettier-config-compass",
3-
"version": "1.1.1",
3+
"version": "1.1.2",
44
"description": "Shared Compass prettier configuration",
55
"license": "SSPL",
66
"main": "index.js",

0 commit comments

Comments
 (0)