Skip to content

Commit b29a408

Browse files
authored
Merge branch 'main' into ni/node22
2 parents 237098e + d790fd0 commit b29a408

File tree

30 files changed

+498
-247
lines changed

30 files changed

+498
-247
lines changed

.evergreen.yml

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4272,7 +4272,6 @@ functions:
42724272
{
42734273
export NODE_JS_VERSION=${node_js_version}
42744274
source .evergreen/setup-env.sh
4275-
export PUPPETEER_SKIP_DOWNLOAD="true"
42764275
npm run evergreen-release draft
42774276
}
42784277
@@ -4290,7 +4289,6 @@ functions:
42904289
node_js_version: ${node_js_version}
42914290
script: |
42924291
set -e
4293-
export PUPPETEER_SKIP_DOWNLOAD="true"
42944292
.evergreen/run-evergreen-release.sh download-and-list-artifacts
42954293
- command: shell.exec
42964294
params:
@@ -4319,7 +4317,6 @@ functions:
43194317
node_js_version: ${node_js_version}
43204318
script: |
43214319
set -e
4322-
export PUPPETEER_SKIP_DOWNLOAD="true"
43234320
.evergreen/run-evergreen-release.sh publish -- --dry-run
43244321
43254322
release_publish:
@@ -4338,7 +4335,6 @@ functions:
43384335
node_js_version: ${node_js_version}
43394336
script: |
43404337
set -e
4341-
export PUPPETEER_SKIP_DOWNLOAD="true"
43424338
.evergreen/run-evergreen-release.sh publish
43434339
43444340
run_perf_tests:
@@ -4865,6 +4861,17 @@ tasks:
48654861
mongosh_test_id: "types"
48664862
mongosh_run_only_in_package: "types"
48674863
task_name: ${task_name}
4864+
# TODO: This is an always failing test to check Foliage. Should be removed afterwards.
4865+
- name: test_always_failing
4866+
tags: ["assigned_to_jira_team_mongosh_mongosh", "unit-test"]
4867+
commands:
4868+
- command: shell.exec
4869+
type: setup
4870+
params:
4871+
working_dir: src
4872+
shell: bash
4873+
script: |
4874+
node -e "throw new Error()"
48684875
48694876
###
48704877
# INTEGRATION TESTS
@@ -11484,6 +11491,7 @@ buildvariants:
1148411491
- name: test_vscode
1148511492
- name: test_connectivity
1148611493
- name: test_apistrict
11494+
- name: test_always_failing
1148711495
- name: linux_coverage
1148811496
display_name: "Ubuntu 20.04 x64 (Coverage and Static Analysis Check)"
1148911497
run_on: ubuntu2004-small

.evergreen/compile-artifact.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@ elif [ -n "$MONGOSH_SHARED_OPENSSL" ]; then
7474
export LD_LIBRARY_PATH=/tmp/m/opt/lib
7575
fi
7676

77-
export PUPPETEER_SKIP_DOWNLOAD="true"
7877
npm run evergreen-release compile
7978
dist/mongosh --version
8079
dist/mongosh --build-info

.evergreen/evergreen.yml.in

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1000,7 +1000,6 @@ functions:
10001000
{
10011001
export NODE_JS_VERSION=${node_js_version}
10021002
source .evergreen/setup-env.sh
1003-
export PUPPETEER_SKIP_DOWNLOAD="true"
10041003
npm run evergreen-release draft
10051004
}
10061005

@@ -1018,7 +1017,6 @@ functions:
10181017
node_js_version: ${node_js_version}
10191018
script: |
10201019
set -e
1021-
export PUPPETEER_SKIP_DOWNLOAD="true"
10221020
.evergreen/run-evergreen-release.sh download-and-list-artifacts
10231021
- command: shell.exec
10241022
params:
@@ -1047,7 +1045,6 @@ functions:
10471045
node_js_version: ${node_js_version}
10481046
script: |
10491047
set -e
1050-
export PUPPETEER_SKIP_DOWNLOAD="true"
10511048
.evergreen/run-evergreen-release.sh publish -- --dry-run
10521049

10531050
release_publish:
@@ -1066,7 +1063,6 @@ functions:
10661063
node_js_version: ${node_js_version}
10671064
script: |
10681065
set -e
1069-
export PUPPETEER_SKIP_DOWNLOAD="true"
10701066
.evergreen/run-evergreen-release.sh publish
10711067

10721068
run_perf_tests:
@@ -1145,7 +1141,7 @@ tasks:
11451141
###
11461142
<% for (const { id, packageName } of ALL_UNIT_TESTS) { %>
11471143
- name: test_<% out(id) %>
1148-
tags: <% out(["assigned_to_jira_team_mongosh_mongosh", "unit-test"]) %>
1144+
tags: ["assigned_to_jira_team_mongosh_mongosh","unit-test"]
11491145
depends_on:
11501146
- name: compile_ts
11511147
variant: linux_compile
@@ -1163,6 +1159,17 @@ tasks:
11631159
mongosh_run_only_in_package: "<% out(packageName) %>"
11641160
task_name: ${task_name}
11651161
<% } %>
1162+
# TODO: This is an always failing test to check Foliage. Should be removed afterwards.
1163+
- name: test_always_failing
1164+
tags: ["assigned_to_jira_team_mongosh_mongosh", "unit-test"]
1165+
commands:
1166+
- command: shell.exec
1167+
type: setup
1168+
params:
1169+
working_dir: src
1170+
shell: bash
1171+
script: |
1172+
node -e "throw new Error()"
11661173

11671174
###
11681175
# INTEGRATION TESTS
@@ -1595,6 +1602,7 @@ buildvariants:
15951602
- name: test_vscode
15961603
- name: test_connectivity
15971604
- name: test_apistrict
1605+
- name: test_always_failing
15981606
- name: linux_coverage
15991607
display_name: "Ubuntu 20.04 x64 (Coverage and Static Analysis Check)"
16001608
run_on: ubuntu2004-small

.evergreen/package-and-upload-artifact.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ if [ "$(uname)" == Linux ]; then
1313
cp "$(pwd)/../tmp/expansions.yaml" tmp/expansions.yaml
1414
(cd scripts/docker && bash "$BASEDIR/retry-with-backoff.sh" docker build -t rocky8-package -f rocky8-package.Dockerfile .)
1515
echo Starting Docker container packaging
16-
docker run -e PUPPETEER_SKIP_DOWNLOAD \
16+
docker run -e PUPPETEER_SKIP_DOWNLOAD=1 \
1717
-e EVERGREEN_EXPANSIONS_PATH=/tmp/build/tmp/expansions.yaml \
1818
-e NODE_JS_VERSION \
1919
-e PACKAGE_VARIANT \

.evergreen/run-evergreen-release.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,4 @@ echo "//registry.npmjs.org/:_authToken=${devtoolsbot_npm_token}" > .npmrc
55
set -x
66
export NODE_JS_VERSION=${node_js_version}
77
source .evergreen/setup-env.sh
8-
export PUPPETEER_SKIP_DOWNLOAD="true"
98
npm run evergreen-release $@

.evergreen/setup-env.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ export PATH="/cygdrive/c/python/Python311/Scripts:/cygdrive/c/python/Python311:/
1616
export MONGOSH_TEST_ONLY_MAX_LOG_FILE_COUNT=100000
1717
export IS_MONGOSH_EVERGREEN_CI=1
1818
export DEBUG="mongodb*,$DEBUG"
19+
export PUPPETEER_SKIP_DOWNLOAD="true"
1920

2021
if [ "$OS" != "Windows_NT" ]; then
2122
if which realpath; then # No realpath on macOS, but also not needed there

AUTHORS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,3 +44,4 @@ Gagik Amaryan <[email protected]>
4444
Nikola Irinchev <[email protected]>
4545
mongodb-matthew-normyle <[email protected]>
4646
mongodb-devtools-bot[bot] <189715634+mongodb-devtools-bot[bot]@users.noreply.github.com>
47+
Dylan Richardson <[email protected]>

THIRD_PARTY_NOTICES.md

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
The following third-party software is used by and included in **mongosh**.
2-
This document was automatically generated on Sun Dec 01 2024.
2+
This document was automatically generated on Thu Dec 12 2024.
33

44
## List of dependencies
55

@@ -177,7 +177,7 @@ Package|Version|License
177177
**[bplist-parser](#a012056f1b32796d923573a3b1ef72cf36943d95e5e2f6af0f7eeab57a21be24)**|0.2.0|MIT
178178
**[brace-expansion](#2ba3ee23cc6a2718243e9c0c59ce154058f292965f563aa291b459a414e863cb)**|1.1.11|MIT
179179
**[browserslist](#a95274c46e5fc3c90b90fdf6cc259a6b44331ddca76e255afd128465621592ed)**|4.23.3|MIT
180-
**[bson](#f2d0bdff40fb1096ef8f7c55e46c6aaa857f74071c79d0dbe89d52b50d5aad81)**|6.10.0|Apache-2.0
180+
**[bson](#88bcf6ee33d70cc1bf263aac89726781fb724e29ba9647909ffb24584ef23cf4)**|6.10.1|Apache-2.0
181181
**[buffer-alloc-unsafe](#1022220a813dd092d3ced592ac36121a00bd08a9c2020e08ad370dc29ed217f0)**|1.1.0|MIT
182182
**[buffer-alloc](#d5cbc95b9dde4a46cd45334630efe3bc9025c904074bee845376bd60651441c0)**|1.2.0|MIT
183183
**[buffer-fill](#c3747dfd267829ceeb564a1717d0c65d88d2b366e215f640067abefac59e3fd4)**|1.0.0|MIT
@@ -241,7 +241,7 @@ Package|Version|License
241241
**[execa](#a0c2c672c3fccddd8bd85ffff34f8f18d893b9f136946e6225b9abc9a8fae10e)**|5.0.0|MIT
242242
**[execa](#099ba5f976333854bfd5aa2237fd12d883c4477af76007a7963109833edef012)**|7.2.0|MIT
243243
**[expand-template](#46d3e73ca0d4a8c14e99252386f0a5c1a4fd8b2747331373d7b4da97105c15bb)**|2.0.3|(MIT OR WTFPL)
244-
**[express](#96b5945aa9b5ba9189eb3e9f50f6522e976d90a93dc42f2f3aa13cbcffb434a2)**|4.21.1|MIT
244+
**[express](#4d2041a77bd4922bcebeb1bb80240f087b10510d23d4a3142db7206a9feb739a)**|4.21.2|MIT
245245
**[fast-xml-parser](#ebbe8cacbca0e6da2c884ade309dddffc2df1cf8f3532ffda03e31aa6d3a9a3b)**|4.4.1|MIT
246246
**[fault](#387740fc7544e813d0a9ad480550d0bb536270783b1ce8c1ee83cd7d18b1472e)**|1.0.4|MIT
247247
**[fetch-blob](#9a40c73e2482c1cc651991133722a6fedd12dc752d2858a21da24395e6fc8461)**|3.2.0|MIT
@@ -341,7 +341,7 @@ Package|Version|License
341341
**[mongodb-crypt-library-version](#003bd2892d6f6fdac0613ba8f9a2fbb054ddd1c26901e1d2fc7e83861b21cf4d)**|1.0.5|Apache-2.0
342342
**[mongodb-log-writer](#c4945018f8490fc8e56e1414e262fcf1b802800e05cd15f2bd6b7a9d0b94af85)**|1.4.2|Apache-2.0
343343
**[mongodb-redact](#d246d19a773f4cc2f2d0431d018a38295c9f9b1b45cfbe7ee16230056b667453)**|1.1.2|Apache-2.0
344-
**[mongodb](#c9c06bd3e18f2425756e0f577c44b2aa70191f47342cb344dea10dbc9a784d05)**|6.11.0|Apache-2.0
344+
**[mongodb](#cb726cf7a5329fc15d51574a4bc2e29682afe46afb788a94370b09643ab98a72)**|6.12.0|Apache-2.0
345345
**[ms](#484b814b85d5028e34246147c8fc901d33570202bd7cdc3703c0ed1078eba0aa)**|2.0.0|MIT
346346
**[ms](#0a987b2f79ff37005e452a5afa7dacd3042061a7077054d2ba9cabacd88506d2)**|2.1.2|MIT
347347
**[ms](#2083576c5af8054927640b4788059806d07e250a26066c9ccb2d928394fb9226)**|2.1.3|MIT
@@ -375,7 +375,7 @@ Package|Version|License
375375
**[parseurl](#c3fdd1b6fb725cb30e8fed82cf929953b46129d347d8404a4a51b633389fbae8)**|1.3.3|MIT
376376
**[path-key](#e1a2a032096ace66b422351e00b11b0229e42e4b49c2146f439f8fe442218451)**|3.1.1|MIT
377377
**[path-key](#8e0734b8abb76579df2174822606e692914e985fc58363a78e6ad4b2a4a5831f)**|4.0.0|MIT
378-
**[path-to-regexp](#96d230365f414cce8d80ceb9d99d855685dfa922f931b49ea01952a1efe64266)**|0.1.10|MIT
378+
**[path-to-regexp](#a36c8f7aea129a341c589b7722e2c873fab8a2d01a0c3e2e426f5b28ba793621)**|0.1.12|MIT
379379
**[path-to-regexp](#571cfd74ecd5ea999273383b83a44bf35d4a62383c67a63fef169cc42eb2d859)**|1.9.0|MIT
380380
**[picocolors](#f964752f1f8cfd947506fd51ce1c148469ecf3b6f531d826511b720670e556f1)**|1.1.0|ISC
381381
**[prebuild-install](#93d13a9b3a51a6a802fcd35aa031d3ae7369aa6fd47d3a89f28a6d31ea3c9dc5)**|7.1.2|MIT
@@ -459,7 +459,7 @@ Package|Version|License
459459
**[xtend](#ef439651e21b69e8811099e984a3a42de35b6d0fc30a5c230715bea4c96e4940)**|4.0.2|MIT
460460
**[yallist](#63b110ffd18712146937e9f182800c6f2b5783e76d1659a0bd4b457789b0df07)**|3.1.1|ISC
461461
**[yallist](#d400799c4e1f58dbbbe68b4d9c1b6e80e023f744bd7d16da491005fd8439200f)**|4.0.0|ISC
462-
**[yargs-parser](#63435b27312552eefd317cb6b5bc59549a3e8c028b3e9510ccd5d5ac644cfa77)**|20.2.4|ISC
462+
**[yargs-parser](#d114360895423d9e902d0d2591b959ed4b0c309f8cec3e7b22fb6ed5502d1c19)**|20.2.9|ISC
463463

464464
## Package details
465465

@@ -20576,8 +20576,8 @@ License files:
2057620576

2057720577

2057820578

20579-
<a id="f2d0bdff40fb1096ef8f7c55e46c6aaa857f74071c79d0dbe89d52b50d5aad81"></a>
20580-
### [bson](https://www.npmjs.com/package/bson) (version 6.10.0)
20579+
<a id="88bcf6ee33d70cc1bf263aac89726781fb724e29ba9647909ffb24584ef23cf4"></a>
20580+
### [bson](https://www.npmjs.com/package/bson) (version 6.10.1)
2058120581
License tags: Apache-2.0
2058220582

2058320583
License files:
@@ -22956,8 +22956,8 @@ License files:
2295622956
THE SOFTWARE.
2295722957

2295822958

22959-
<a id="96b5945aa9b5ba9189eb3e9f50f6522e976d90a93dc42f2f3aa13cbcffb434a2"></a>
22960-
### [express](https://www.npmjs.com/package/express) (version 4.21.1)
22959+
<a id="4d2041a77bd4922bcebeb1bb80240f087b10510d23d4a3142db7206a9feb739a"></a>
22960+
### [express](https://www.npmjs.com/package/express) (version 4.21.2)
2296122961
License tags: MIT
2296222962

2296322963
License files:
@@ -27766,8 +27766,8 @@ License files:
2776627766

2776727767

2776827768

27769-
<a id="c9c06bd3e18f2425756e0f577c44b2aa70191f47342cb344dea10dbc9a784d05"></a>
27770-
### [mongodb](https://www.npmjs.com/package/mongodb) (version 6.11.0)
27769+
<a id="cb726cf7a5329fc15d51574a4bc2e29682afe46afb788a94370b09643ab98a72"></a>
27770+
### [mongodb](https://www.npmjs.com/package/mongodb) (version 6.12.0)
2777127771
License tags: Apache-2.0
2777227772

2777327773
License files:
@@ -28860,8 +28860,8 @@ License files:
2886028860

2886128861

2886228862

28863-
<a id="96d230365f414cce8d80ceb9d99d855685dfa922f931b49ea01952a1efe64266"></a>
28864-
### [path-to-regexp](https://www.npmjs.com/package/path-to-regexp) (version 0.1.10)
28863+
<a id="a36c8f7aea129a341c589b7722e2c873fab8a2d01a0c3e2e426f5b28ba793621"></a>
28864+
### [path-to-regexp](https://www.npmjs.com/package/path-to-regexp) (version 0.1.12)
2886528865
License tags: MIT
2886628866

2886728867
License files:
@@ -31765,8 +31765,8 @@ License files:
3176531765

3176631766

3176731767

31768-
<a id="63435b27312552eefd317cb6b5bc59549a3e8c028b3e9510ccd5d5ac644cfa77"></a>
31769-
### [yargs-parser](https://www.npmjs.com/package/yargs-parser) (version 20.2.4)
31768+
<a id="d114360895423d9e902d0d2591b959ed4b0c309f8cec3e7b22fb6ed5502d1c19"></a>
31769+
### [yargs-parser](https://www.npmjs.com/package/yargs-parser) (version 20.2.9)
3177031770
License tags: ISC
3177131771

3177231772
License files:

0 commit comments

Comments
 (0)