Skip to content

Commit d071833

Browse files
gagikgagik
committed
chore: filter with evergreen install
1 parent e9dfc41 commit d071833

File tree

3 files changed

+48
-2
lines changed

3 files changed

+48
-2
lines changed

‎.evergreen.yml‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,7 @@ functions:
163163
DISTRO_ID: ${distro_id}
164164
MONOGDB_DRIVER_VERSION_OVERRIDE: ${mongodb_driver_version_override}
165165
PUPPETEER_SKIP_DOWNLOAD: ${puppeteer_skip_download|true}
166+
MONGOSH_INSTALL_WORKSPACE: ${mongosh_install_workspace|}
166167
script: |
167168
set -e
168169
set -x
@@ -6206,6 +6207,7 @@ tasks:
62066207
vars:
62076208
node_js_version: ${node_js_version}
62086209
puppeteer_skip_download: "true"
6210+
mongosh_install_workspace: "@mongosh/arg-parser"
62096211
- func: test
62106212
vars:
62116213
mongosh_server_test_version: ${mongosh_server_test_version}
@@ -6225,6 +6227,7 @@ tasks:
62256227
vars:
62266228
node_js_version: ${node_js_version}
62276229
puppeteer_skip_download: "true"
6230+
mongosh_install_workspace: "@mongosh/async-rewriter2"
62286231
- func: test
62296232
vars:
62306233
mongosh_server_test_version: ${mongosh_server_test_version}
@@ -6244,6 +6247,7 @@ tasks:
62446247
vars:
62456248
node_js_version: ${node_js_version}
62466249
puppeteer_skip_download: "true"
6250+
mongosh_install_workspace: "@mongosh/autocomplete"
62476251
- func: test
62486252
vars:
62496253
mongosh_server_test_version: ${mongosh_server_test_version}
@@ -6263,6 +6267,7 @@ tasks:
62636267
vars:
62646268
node_js_version: ${node_js_version}
62656269
puppeteer_skip_download: "false"
6270+
mongosh_install_workspace: "@mongosh/browser-repl"
62666271
- func: test
62676272
vars:
62686273
mongosh_server_test_version: ${mongosh_server_test_version}
@@ -6282,6 +6287,7 @@ tasks:
62826287
vars:
62836288
node_js_version: ${node_js_version}
62846289
puppeteer_skip_download: "true"
6290+
mongosh_install_workspace: "@mongosh/browser-runtime-core"
62856291
- func: test
62866292
vars:
62876293
mongosh_server_test_version: ${mongosh_server_test_version}
@@ -6301,6 +6307,7 @@ tasks:
63016307
vars:
63026308
node_js_version: ${node_js_version}
63036309
puppeteer_skip_download: "true"
6310+
mongosh_install_workspace: "@mongosh/browser-runtime-electron"
63046311
- func: test
63056312
vars:
63066313
mongosh_server_test_version: ${mongosh_server_test_version}
@@ -6320,6 +6327,7 @@ tasks:
63206327
vars:
63216328
node_js_version: ${node_js_version}
63226329
puppeteer_skip_download: "true"
6330+
mongosh_install_workspace: "@mongosh/build"
63236331
- func: test
63246332
vars:
63256333
mongosh_server_test_version: ${mongosh_server_test_version}
@@ -6339,6 +6347,7 @@ tasks:
63396347
vars:
63406348
node_js_version: ${node_js_version}
63416349
puppeteer_skip_download: "true"
6350+
mongosh_install_workspace: "@mongosh/cli-repl"
63426351
- func: test
63436352
vars:
63446353
mongosh_server_test_version: ${mongosh_server_test_version}
@@ -6358,6 +6367,7 @@ tasks:
63586367
vars:
63596368
node_js_version: ${node_js_version}
63606369
puppeteer_skip_download: "true"
6370+
mongosh_install_workspace: "@mongosh/connectivity-tests"
63616371
- func: test
63626372
vars:
63636373
mongosh_server_test_version: ${mongosh_server_test_version}
@@ -6377,6 +6387,7 @@ tasks:
63776387
vars:
63786388
node_js_version: ${node_js_version}
63796389
puppeteer_skip_download: "true"
6390+
mongosh_install_workspace: "@mongosh/e2e-tests"
63806391
- func: test
63816392
vars:
63826393
mongosh_server_test_version: ${mongosh_server_test_version}
@@ -6396,6 +6407,7 @@ tasks:
63966407
vars:
63976408
node_js_version: ${node_js_version}
63986409
puppeteer_skip_download: "true"
6410+
mongosh_install_workspace: "@mongosh/editor"
63996411
- func: test
64006412
vars:
64016413
mongosh_server_test_version: ${mongosh_server_test_version}
@@ -6415,6 +6427,7 @@ tasks:
64156427
vars:
64166428
node_js_version: ${node_js_version}
64176429
puppeteer_skip_download: "true"
6430+
mongosh_install_workspace: "@mongosh/errors"
64186431
- func: test
64196432
vars:
64206433
mongosh_server_test_version: ${mongosh_server_test_version}
@@ -6434,6 +6447,7 @@ tasks:
64346447
vars:
64356448
node_js_version: ${node_js_version}
64366449
puppeteer_skip_download: "true"
6450+
mongosh_install_workspace: "@mongosh/history"
64376451
- func: test
64386452
vars:
64396453
mongosh_server_test_version: ${mongosh_server_test_version}
@@ -6453,6 +6467,7 @@ tasks:
64536467
vars:
64546468
node_js_version: ${node_js_version}
64556469
puppeteer_skip_download: "true"
6470+
mongosh_install_workspace: "@mongosh/i18n"
64566471
- func: test
64576472
vars:
64586473
mongosh_server_test_version: ${mongosh_server_test_version}
@@ -6472,6 +6487,7 @@ tasks:
64726487
vars:
64736488
node_js_version: ${node_js_version}
64746489
puppeteer_skip_download: "true"
6490+
mongosh_install_workspace: "@mongosh/java-shell"
64756491
- func: test
64766492
vars:
64776493
mongosh_server_test_version: ${mongosh_server_test_version}
@@ -6491,6 +6507,7 @@ tasks:
64916507
vars:
64926508
node_js_version: ${node_js_version}
64936509
puppeteer_skip_download: "true"
6510+
mongosh_install_workspace: "@mongosh/js-multiline-to-singleline"
64946511
- func: test
64956512
vars:
64966513
mongosh_server_test_version: ${mongosh_server_test_version}
@@ -6510,6 +6527,7 @@ tasks:
65106527
vars:
65116528
node_js_version: ${node_js_version}
65126529
puppeteer_skip_download: "true"
6530+
mongosh_install_workspace: "@mongosh/logging"
65136531
- func: test
65146532
vars:
65156533
mongosh_server_test_version: ${mongosh_server_test_version}
@@ -6529,6 +6547,7 @@ tasks:
65296547
vars:
65306548
node_js_version: ${node_js_version}
65316549
puppeteer_skip_download: "true"
6550+
mongosh_install_workspace: "@mongosh/mongosh"
65326551
- func: test
65336552
vars:
65346553
mongosh_server_test_version: ${mongosh_server_test_version}
@@ -6548,6 +6567,7 @@ tasks:
65486567
vars:
65496568
node_js_version: ${node_js_version}
65506569
puppeteer_skip_download: "true"
6570+
mongosh_install_workspace: "@mongosh/node-runtime-worker-thread"
65516571
- func: test
65526572
vars:
65536573
mongosh_server_test_version: ${mongosh_server_test_version}
@@ -6567,6 +6587,7 @@ tasks:
65676587
vars:
65686588
node_js_version: ${node_js_version}
65696589
puppeteer_skip_download: "true"
6590+
mongosh_install_workspace: "@mongosh/service-provider-core"
65706591
- func: test
65716592
vars:
65726593
mongosh_server_test_version: ${mongosh_server_test_version}
@@ -6586,6 +6607,7 @@ tasks:
65866607
vars:
65876608
node_js_version: ${node_js_version}
65886609
puppeteer_skip_download: "true"
6610+
mongosh_install_workspace: "@mongosh/service-provider-node-driver"
65896611
- func: test
65906612
vars:
65916613
mongosh_server_test_version: ${mongosh_server_test_version}
@@ -6605,6 +6627,7 @@ tasks:
66056627
vars:
66066628
node_js_version: ${node_js_version}
66076629
puppeteer_skip_download: "true"
6630+
mongosh_install_workspace: "@mongosh/shell-api"
66086631
- func: test
66096632
vars:
66106633
mongosh_server_test_version: ${mongosh_server_test_version}
@@ -6624,6 +6647,7 @@ tasks:
66246647
vars:
66256648
node_js_version: ${node_js_version}
66266649
puppeteer_skip_download: "true"
6650+
mongosh_install_workspace: "@mongosh/shell-bson"
66276651
- func: test
66286652
vars:
66296653
mongosh_server_test_version: ${mongosh_server_test_version}
@@ -6643,6 +6667,7 @@ tasks:
66436667
vars:
66446668
node_js_version: ${node_js_version}
66456669
puppeteer_skip_download: "true"
6670+
mongosh_install_workspace: "@mongosh/shell-evaluator"
66466671
- func: test
66476672
vars:
66486673
mongosh_server_test_version: ${mongosh_server_test_version}
@@ -6662,6 +6687,7 @@ tasks:
66626687
vars:
66636688
node_js_version: ${node_js_version}
66646689
puppeteer_skip_download: "true"
6690+
mongosh_install_workspace: "@mongosh/snippet-manager"
66656691
- func: test
66666692
vars:
66676693
mongosh_server_test_version: ${mongosh_server_test_version}
@@ -6681,6 +6707,7 @@ tasks:
66816707
vars:
66826708
node_js_version: ${node_js_version}
66836709
puppeteer_skip_download: "true"
6710+
mongosh_install_workspace: "@mongosh/testing"
66846711
- func: test
66856712
vars:
66866713
mongosh_server_test_version: ${mongosh_server_test_version}
@@ -6700,6 +6727,7 @@ tasks:
67006727
vars:
67016728
node_js_version: ${node_js_version}
67026729
puppeteer_skip_download: "true"
6730+
mongosh_install_workspace: "@mongosh/types"
67036731
- func: test
67046732
vars:
67056733
mongosh_server_test_version: ${mongosh_server_test_version}

‎.evergreen/evergreen.yml.in‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,7 @@ functions:
172172
DISTRO_ID: ${distro_id}
173173
MONOGDB_DRIVER_VERSION_OVERRIDE: ${mongodb_driver_version_override}
174174
PUPPETEER_SKIP_DOWNLOAD: ${puppeteer_skip_download|true}
175+
MONGOSH_INSTALL_WORKSPACE: ${mongosh_install_workspace|}
175176
script: |
176177
set -e
177178
set -x
@@ -1167,6 +1168,7 @@ tasks:
11671168
vars:
11681169
node_js_version: ${node_js_version}
11691170
puppeteer_skip_download: "<% out(usePuppeteer ? "false" : "true") %>"
1171+
mongosh_install_workspace: "@mongosh/<% out(packageName) %>"
11701172
- func: test
11711173
vars:
11721174
mongosh_server_test_version: ${mongosh_server_test_version}

‎.evergreen/install-npm-deps.sh‎

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,13 @@ export BASEDIR="$PWD/.evergreen"
55

66
. "$BASEDIR/setup-env.sh"
77

8-
npm ci --verbose
8+
# If MONGOSH_INSTALL_WORKSPACE is set, install only that workspace
9+
if [[ -n "$MONGOSH_INSTALL_WORKSPACE" ]]; then
10+
echo "Installing workspace: $MONGOSH_INSTALL_WORKSPACE"
11+
npm ci -w "$MONGOSH_INSTALL_WORKSPACE" --include-workspace-root --verbose
12+
else
13+
npm ci --verbose
14+
fi
915
echo "MONOGDB_DRIVER_VERSION_OVERRIDE:$MONOGDB_DRIVER_VERSION_OVERRIDE"
1016

1117
# if MONOGDB_DRIVER_VERSION_OVERRIDE is set, then we want to replace the package version
@@ -28,7 +34,17 @@ npm run mark-ci-required-optional-dependencies
2834
# mongodb-client-encryption failed to install (it can't install on some
2935
# platforms), then install again ignoring scripts so that the package installs
3036
# along with its types, but npm wouldn't try and compile the addon
31-
(npm ci && test -e node_modules/mongodb-client-encryption) || npm ci --ignore-scripts
37+
if [[ -n "$MONGOSH_INSTALL_WORKSPACE" ]]; then
38+
# Check if the workspace or root actually depends on mongodb-client-encryption
39+
if npm ls --workspace "$MONGOSH_INSTALL_WORKSPACE" --depth=1 mongodb-client-encryption > /dev/null 2>&1; then
40+
echo "Workspace or root depends on mongodb-client-encryption, retrying install with optional deps..."
41+
(npm ci -w "$MONGOSH_INSTALL_WORKSPACE" --include-workspace-root && test -e node_modules/mongodb-client-encryption) || npm ci -w "$MONGOSH_INSTALL_WORKSPACE" --include-workspace-root --ignore-scripts
42+
else
43+
echo "Workspace does not depend on mongodb-client-encryption, skipping optional deps reinstall"
44+
fi
45+
else
46+
(npm ci && test -e node_modules/mongodb-client-encryption) || npm ci --ignore-scripts
47+
fi
3248

3349
echo "npm packages after installation"
3450
npm ls || true

0 commit comments

Comments
 (0)