Skip to content

Commit 0ef9742

Browse files
committed
Merge branch 'main' into NODE-3482-rm-unref
2 parents 15a5b1a + 21db1a9 commit 0ef9742

File tree

16 files changed

+628
-315
lines changed

16 files changed

+628
-315
lines changed

.evergreen/config.in.yml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -798,18 +798,6 @@ functions:
798798
799799
bash ${PROJECT_DIRECTORY}/.evergreen/run-custom-csfle-tests.sh
800800
801-
"run custom snappy tests":
802-
- command: subprocess.exec
803-
params:
804-
working_dir: "src"
805-
timeout_secs: 60
806-
env:
807-
MONGODB_URI: ${MONGODB_URI}
808-
PROJECT_DIRECTORY: ${PROJECT_DIRECTORY}
809-
binary: bash
810-
args:
811-
- "${PROJECT_DIRECTORY}/.evergreen/run-snappy-version-test.sh"
812-
813801
"run lambda handler example tests":
814802
- command: subprocess.exec
815803
params:

.evergreen/config.yml

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -758,17 +758,6 @@ functions:
758758
echo "CRYPT_SHARED_LIB_PATH: $CRYPT_SHARED_LIB_PATH"
759759
760760
bash ${PROJECT_DIRECTORY}/.evergreen/run-custom-csfle-tests.sh
761-
run custom snappy tests:
762-
- command: subprocess.exec
763-
params:
764-
working_dir: src
765-
timeout_secs: 60
766-
env:
767-
MONGODB_URI: ${MONGODB_URI}
768-
PROJECT_DIRECTORY: ${PROJECT_DIRECTORY}
769-
binary: bash
770-
args:
771-
- ${PROJECT_DIRECTORY}/.evergreen/run-snappy-version-test.sh
772761
run lambda handler example tests:
773762
- command: subprocess.exec
774763
params:
@@ -2142,20 +2131,6 @@ tasks:
21422131
variant: '*'
21432132
status: '*'
21442133
patch_optional: true
2145-
- name: run-custom-snappy-tests
2146-
tags:
2147-
- run-custom-dependency-tests
2148-
commands:
2149-
- func: install dependencies
2150-
vars:
2151-
NODE_LTS_NAME: erbium
2152-
- func: bootstrap mongo-orchestration
2153-
vars:
2154-
VERSION: '5.0'
2155-
TOPOLOGY: server
2156-
AUTH: auth
2157-
- name: run-custom-snappy-tests
2158-
func: run custom snappy tests
21592134
- name: run-bson-ext-integration
21602135
tags:
21612136
- run-custom-dependency-tests
@@ -3175,7 +3150,6 @@ buildvariants:
31753150
display_name: Custom Dependency Version Test
31763151
run_on: rhel80-large
31773152
tasks:
3178-
- run-custom-snappy-tests
31793153
- run-bson-ext-integration
31803154
- run-bson-ext-unit
31813155
- run-custom-csfle-tests-5.0-pinned-commit

.evergreen/generate_evergreen_tasks.js

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -578,10 +578,6 @@ BUILD_VARIANTS.push({
578578
});
579579

580580
const oneOffFuncs = [
581-
{
582-
name: 'run-custom-snappy-tests',
583-
func: 'run custom snappy tests'
584-
},
585581
{
586582
name: 'run-bson-ext-integration',
587583
func: 'run bson-ext test',

.evergreen/run-snappy-version-test.sh

Lines changed: 0 additions & 12 deletions
This file was deleted.

.github/workflows/dependencies.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,5 @@ jobs:
2222
with:
2323
node-version: ${{ matrix.node-version }}
2424
cache: 'npm'
25-
- run: npm install
25+
- run: npm clean-install
2626
- run: npm run check:dependencies

etc/notes/CHANGES_5.0.0.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,15 @@ The following is a detailed collection of the changes in the major v5 release of
1616

1717
## Changes
1818

19+
### Snappy v7.x.x or later and optional peerDependency
20+
21+
`snappy` compression has been added to the package.json as a peerDependency that is **optional**.
22+
This means `npm` will let you know if the version of snappy you have installed is incompatible with the driver.
23+
24+
```sh
25+
npm install --save snappy@7
26+
```
27+
1928
### `.unref()` removed from `Db`
2029

2130
The `.unref()` method was a no-op and has now been removed from the Db class.

0 commit comments

Comments
 (0)