Skip to content

Commit

Permalink
Merge branch 'main' of github.com:mongodb-js/mongosh into gagik/get-s…
Browse files Browse the repository at this point in the history
…hard-orphan-documents
  • Loading branch information
gagik committed Oct 8, 2024
2 parents 59e6f25 + 591aaa5 commit 3295799
Show file tree
Hide file tree
Showing 18 changed files with 1,039 additions and 1,923 deletions.
2,608 changes: 854 additions & 1,754 deletions .evergreen.yml

Large diffs are not rendered by default.

13 changes: 8 additions & 5 deletions .evergreen/evergreen.yml.in
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,11 @@ for (const packageInfo of MONGOSH_PACKAGES) {
for (const { shortName: mShort, versionSpec: mVersion } of MONGODB_VERSIONS) {
let variants = packageInfo.variants ?? defaultVariants;
variants = (mShort === '42xe') ?
// The MongoDB 4.2 enterprise server does not work on Ubuntu 20.04
variants.filter(v => v !== 'linux') :
// The MongoDB 4.2 enterprise server does not work on Ubuntu 20.04 or arm64 macOS
variants.filter(v => v !== 'linux' && v !== 'darwin') :
// Unit tests on macOS use arm64 and therefore require 6.0+
(['42xc', '42xe', '44xc', '44xe', '50xc', '50xe'].includes(mShort)) ?
variants.filter(v => v !== 'darwin') :
variants;
const id = `m${mShort}_n${nShort}_${packageInfo.name.replace(/-/g, '_')}`;
ALL_UNIT_TESTS.push({
Expand Down Expand Up @@ -1499,10 +1502,10 @@ tasks:
# Need to run builds for every possible build variant.
buildvariants:
- name: darwin_unit
display_name: "MacOS Big Sur (Unit tests)"
run_on: macos-11
display_name: "MacOS 14 arm64 (Unit tests)"
run_on: macos-14-arm64
expansions:
executable_os_id: darwin-x64
executable_os_id: darwin-arm64
tasks:
- name: check
<% for (const test of ALL_UNIT_TESTS.filter(t => t.variants.includes('darwin'))) { %>
Expand Down
2 changes: 1 addition & 1 deletion .evergreen/install-node.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ export BASEDIR="$PWD/.evergreen"
if echo $NODE_JS_VERSION | grep -q ^16 ; then
NPM_VERSION=9.9.2 # 9.9.3 does not install well on Windows
else
NPM_VERSION=10.x
NPM_VERSION=10.8.3 # 10.9.0 does not install well on Windows
fi

if [ "$OS" == "Windows_NT" ]; then
Expand Down
6 changes: 3 additions & 3 deletions .evergreen/node-20-latest.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": "20.17.0",
"version": "20.18.0",
"major": 20,
"minor": 17,
"minor": 18,
"patch": 0,
"tag": "",
"codename": "iron",
Expand All @@ -10,7 +10,7 @@
"lts": "2023-10-24T00:00:00.000Z",
"maintenance": "2024-10-22T00:00:00.000Z",
"end": "2026-04-30T00:00:00.000Z",
"releaseDate": "2024-08-21T00:00:00.000Z",
"releaseDate": "2024-10-03T00:00:00.000Z",
"isLts": true,
"files": [
"aix-ppc64",
Expand Down
1 change: 1 addition & 0 deletions AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -40,3 +40,4 @@ pulkitkalra-mdb <[email protected]>
Alena Khineika <[email protected]>
Orgad Shaneh <[email protected]>
Kræn Hansen <[email protected]>
Gagik Amaryan <[email protected]>
49 changes: 7 additions & 42 deletions THIRD_PARTY_NOTICES.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
The following third-party software is used by and included in **mongosh**.
This document was automatically generated on Tue Oct 01 2024.
This document was automatically generated on Tue Oct 08 2024.

## List of dependencies

Expand Down Expand Up @@ -206,8 +206,7 @@ Package|Version|License
**[convert-source-map](#3fd403e08667d2dfb45e092b838d63d7b9b81664ca47d42aa2f058336da34dac)**|1.1.3|MIT
**[convert-source-map](#0acf0ab7734deb5e364e5150eb235062022893835b113aa11e0c7e9065fa5073)**|1.8.0|MIT
**[cookie-signature](#28f6116b52488ac66a14424869fc346f611bea6c894e7d0f7f2ca701deb8e49c)**|1.0.6|MIT
**[cookie](#3e008828d29a22304571d10c58b106a8bef5907201487c16f3fb5fd6fabb16a9)**|0.4.2|MIT
**[cookie](#c396652ff004385e7bdb8398e37493d5f4144e475282a413ec52f1d3fdaf25da)**|0.6.0|MIT
**[cookie](#bde361a738adb8c6192392882be351044a7c3288371719294b61bf796e2a8126)**|0.7.2|MIT
**[core-util-is](#31f9375081d39ad369df4ed795b2f399287432f0b6579229579e26883fa75085)**|1.0.3|MIT
**[cpu-features](#fa992e00865a6ed732ac63bbf64c89ee2da4ec39944684e6002a3a34b5adb65c)**|0.0.9|MIT
**[cross-spawn](#67de3a765808182ee1018c35bc07d7a023a8d645e98cc32814dcac2fc2c427ff)**|7.0.3|MIT
Expand Down Expand Up @@ -318,7 +317,7 @@ Package|Version|License
**[jsesc](#253e8a44fc188759c5ce35330e4f20aacf1d0253d7e8d7dffd4a1f884a10ce1e)**|2.5.2|MIT
**[json5](#16281c6ea25e0cec4bc0bb8c01d1759d66992776381bf9c5af6959bec47d2f77)**|2.2.3|MIT
**[jsonfile](#ee6699687d879e2655eb0c687d7d8ad7bf952bb8a1092d720b58ae709e885213)**|4.0.0|MIT
**[kerberos](#ac70d4903c6441fd96843a6ecb73f258ee27ef26b25290257564a11c10ecd17b)**|2.2.0|Apache-2.0
**[kerberos](#05c7d2f17faccacb505a07f79ccba22ce089aa668a8bef64de84cf5dcd4f585e)**|2.1.0|Apache-2.0
**[lodash.merge](#996e40d63a94f1b8693d7c81e0cdfb874c6432d6bbd675976fc1b6b13652c8db)**|4.6.2|MIT
**[lodash](#adaac4144887ebc2c1b682380ff385210f681fc58b4bc1ef3986148cf8dcd28a)**|4.17.21|MIT
**[lowlight](#6efc5090c0eda3b461d933d6b79bddcdf8165a10aea9f39ac76620ce5fb05bf5)**|1.17.0|MIT
Expand Down Expand Up @@ -21830,42 +21829,8 @@ License files:
License tags: MIT


<a id="3e008828d29a22304571d10c58b106a8bef5907201487c16f3fb5fd6fabb16a9"></a>
### [cookie](https://www.npmjs.com/package/cookie) (version 0.4.2)
License tags: MIT

License files:
* LICENSE:

(The MIT License)

Copyright (c) 2012-2014 Roman Shtylman <[email protected]>
Copyright (c) 2015 Douglas Christopher Wilson <[email protected]>

Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
'Software'), to deal in the Software without restriction, including
without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Software, and to
permit persons to whom the Software is furnished to do so, subject to
the following conditions:

The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.




<a id="c396652ff004385e7bdb8398e37493d5f4144e475282a413ec52f1d3fdaf25da"></a>
### [cookie](https://www.npmjs.com/package/cookie) (version 0.6.0)
<a id="bde361a738adb8c6192392882be351044a7c3288371719294b61bf796e2a8126"></a>
### [cookie](https://www.npmjs.com/package/cookie) (version 0.7.2)
License tags: MIT

License files:
Expand Down Expand Up @@ -25738,8 +25703,8 @@ License files:



<a id="ac70d4903c6441fd96843a6ecb73f258ee27ef26b25290257564a11c10ecd17b"></a>
### [kerberos](https://www.npmjs.com/package/kerberos) (version 2.2.0)
<a id="05c7d2f17faccacb505a07f79ccba22ce089aa668a8bef64de84cf5dcd4f585e"></a>
### [kerberos](https://www.npmjs.com/package/kerberos) (version 2.1.0)
License tags: Apache-2.0

License files:
Expand Down
Loading

0 comments on commit 3295799

Please sign in to comment.