Skip to content

Commit 705f4ff

Browse files
committed
Merge branch 'main' into keep-operation-in-progress2
2 parents 3567fcb + f9a0631 commit 705f4ff

File tree

23 files changed

+277
-192
lines changed

23 files changed

+277
-192
lines changed

.evergreen.yml

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7590,7 +7590,6 @@ functions:
75907590
{
75917591
export NODE_JS_VERSION=${node_js_version}
75927592
source .evergreen/setup-env.sh
7593-
export PUPPETEER_SKIP_DOWNLOAD="true"
75947593
npm run evergreen-release draft
75957594
}
75967595

@@ -7608,7 +7607,6 @@ functions:
76087607
node_js_version: ${node_js_version}
76097608
script: |
76107609
set -e
7611-
export PUPPETEER_SKIP_DOWNLOAD="true"
76127610
.evergreen/run-evergreen-release.sh download-and-list-artifacts
76137611
- command: shell.exec
76147612
params:
@@ -7637,7 +7635,6 @@ functions:
76377635
node_js_version: ${node_js_version}
76387636
script: |
76397637
set -e
7640-
export PUPPETEER_SKIP_DOWNLOAD="true"
76417638
.evergreen/run-evergreen-release.sh publish -- --dry-run
76427639

76437640
release_publish:
@@ -7656,7 +7653,6 @@ functions:
76567653
node_js_version: ${node_js_version}
76577654
script: |
76587655
set -e
7659-
export PUPPETEER_SKIP_DOWNLOAD="true"
76607656
.evergreen/run-evergreen-release.sh publish
76617657

76627658
run_perf_tests:
@@ -8183,6 +8179,17 @@ tasks:
81838179
mongosh_test_id: "types"
81848180
mongosh_run_only_in_package: "types"
81858181
task_name: ${task_name}
8182+
# TODO: This is an always failing test to check Foliage. Should be removed afterwards.
8183+
- name: test_always_failing
8184+
tags: ["assigned_to_jira_team_mongosh_mongosh", "unit-test"]
8185+
commands:
8186+
- command: shell.exec
8187+
type: setup
8188+
params:
8189+
working_dir: src
8190+
shell: bash
8191+
script: |
8192+
node -e "throw new Error()"
81868193

81878194
###
81888195
# INTEGRATION TESTS
@@ -15908,6 +15915,7 @@ buildvariants:
1590815915
- name: test_vscode
1590915916
- name: test_connectivity
1591015917
- name: test_apistrict
15918+
- name: test_always_failing
1591115919
- name: linux_coverage
1591215920
display_name: "Ubuntu 20.04 x64 (Coverage and Static Analysis Check)"
1591315921
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
@@ -1002,7 +1002,6 @@ functions:
10021002
{
10031003
export NODE_JS_VERSION=${node_js_version}
10041004
source .evergreen/setup-env.sh
1005-
export PUPPETEER_SKIP_DOWNLOAD="true"
10061005
npm run evergreen-release draft
10071006
}
10081007

@@ -1020,7 +1019,6 @@ functions:
10201019
node_js_version: ${node_js_version}
10211020
script: |
10221021
set -e
1023-
export PUPPETEER_SKIP_DOWNLOAD="true"
10241022
.evergreen/run-evergreen-release.sh download-and-list-artifacts
10251023
- command: shell.exec
10261024
params:
@@ -1049,7 +1047,6 @@ functions:
10491047
node_js_version: ${node_js_version}
10501048
script: |
10511049
set -e
1052-
export PUPPETEER_SKIP_DOWNLOAD="true"
10531050
.evergreen/run-evergreen-release.sh publish -- --dry-run
10541051

10551052
release_publish:
@@ -1068,7 +1065,6 @@ functions:
10681065
node_js_version: ${node_js_version}
10691066
script: |
10701067
set -e
1071-
export PUPPETEER_SKIP_DOWNLOAD="true"
10721068
.evergreen/run-evergreen-release.sh publish
10731069

10741070
run_perf_tests:
@@ -1147,7 +1143,7 @@ tasks:
11471143
###
11481144
<% for (const { id, packageName } of ALL_UNIT_TESTS) { %>
11491145
- name: test_<% out(id) %>
1150-
tags: <% out(["assigned_to_jira_team_mongosh_mongosh", "unit-test"]) %>
1146+
tags: ["assigned_to_jira_team_mongosh_mongosh","unit-test"]
11511147
depends_on:
11521148
- name: compile_ts
11531149
variant: linux_compile
@@ -1165,6 +1161,17 @@ tasks:
11651161
mongosh_run_only_in_package: "<% out(packageName) %>"
11661162
task_name: ${task_name}
11671163
<% } %>
1164+
# TODO: This is an always failing test to check Foliage. Should be removed afterwards.
1165+
- name: test_always_failing
1166+
tags: ["assigned_to_jira_team_mongosh_mongosh", "unit-test"]
1167+
commands:
1168+
- command: shell.exec
1169+
type: setup
1170+
params:
1171+
working_dir: src
1172+
shell: bash
1173+
script: |
1174+
node -e "throw new Error()"
11681175

11691176
###
11701177
# INTEGRATION TESTS
@@ -1597,6 +1604,7 @@ buildvariants:
15971604
- name: test_vscode
15981605
- name: test_connectivity
15991606
- name: test_apistrict
1607+
- name: test_always_failing
16001608
- name: linux_coverage
16011609
display_name: "Ubuntu 20.04 x64 (Coverage and Static Analysis Check)"
16021610
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: 10 additions & 10 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 08 2024.
2+
This document was automatically generated on Wed Dec 11 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
@@ -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
@@ -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:
@@ -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:
@@ -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)