Skip to content

Commit 7a0083e

Browse files
committed
Merge branch '9.0' into vkarpov15/gh-14954
2 parents ad7824f + 70ddfd8 commit 7a0083e

File tree

238 files changed

+16405
-4961
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

238 files changed

+16405
-4961
lines changed

.eslintrc.js

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

.github/workflows/benchmark.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,16 @@ permissions:
1919

2020
jobs:
2121
typescript:
22-
runs-on: ubuntu-20.04
22+
runs-on: ubuntu-22.04
2323
name: Benchmark TypeScript Types
2424
steps:
25-
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
25+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2626
with:
2727
fetch-depth: 0
2828
- name: Setup node
29-
uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4
29+
uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0
3030
with:
31-
node-version: 16
31+
node-version: 22
3232

3333
- run: npm install
3434

.github/workflows/codeql.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121

2222
steps:
2323
- name: Checkout repository
24-
uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
24+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2525

2626
# Initializes the CodeQL tools for scanning.
2727
- name: Initialize CodeQL

.github/workflows/documentation.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@ jobs:
2828
runs-on: ubuntu-latest
2929
name: Lint Markdown files
3030
steps:
31-
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
31+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
3232

3333
- name: Setup node
34-
uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4
34+
uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0
3535
with:
36-
node-version: 20
36+
node-version: 22
3737

3838
- run: npm install
3939

@@ -45,28 +45,28 @@ jobs:
4545
# run: npm run lint-js
4646

4747
test-documentation:
48-
runs-on: ubuntu-20.04
48+
runs-on: ubuntu-22.04
4949
name: Test Generating Docs
5050
steps:
51-
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
51+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
5252
- run: git fetch --depth=1 --tags # download all tags for documentation
5353

5454
- name: Setup node
55-
uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4
55+
uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0
5656
with:
57-
node-version: 20
57+
node-version: 22
5858

5959
- run: npm install
6060
- name: Setup MongoDB
6161
run: |
62-
wget -q https://downloads.mongodb.org/linux/mongodb-linux-x86_64-ubuntu2004-5.0.14.tgz
63-
tar xf mongodb-linux-x86_64-ubuntu2004-5.0.14.tgz
62+
wget -q https://downloads.mongodb.org/linux/mongodb-linux-x86_64-ubuntu2204-6.0.20.tgz
63+
tar xf mongodb-linux-x86_64-ubuntu2204-6.0.20.tgz
6464
mkdir -p ./data/db/27017 ./data/db/27000
6565
printf "\n--timeout 8000" >> ./test/mocha.opts
66-
./mongodb-linux-x86_64-ubuntu2004-5.0.14/bin/mongod --setParameter ttlMonitorSleepSecs=1 --fork --dbpath ./data/db/27017 --syslog --port 27017
66+
./mongodb-linux-x86_64-ubuntu2204-6.0.20/bin/mongod --setParameter ttlMonitorSleepSecs=1 --fork --dbpath ./data/db/27017 --syslog --port 27017
6767
sleep 2
68-
mongod --version
69-
echo `pwd`/mongodb-linux-x86_64-ubuntu2004-5.0.14/bin >> $GITHUB_PATH
68+
./mongodb-linux-x86_64-ubuntu2204-6.0.20/bin/mongod --version
69+
echo `pwd`/mongodb-linux-x86_64-ubuntu2204-6.0.20/bin >> $GITHUB_PATH
7070
- name: Setup config
7171
run: |
7272
echo "module.exports = {uri:'mongodb://127.0.0.1:27017/mongoose_test'};" > ./.config.js
Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
name: Encryption Tests
2+
3+
on:
4+
push:
5+
branches: ['master']
6+
pull_request:
7+
branches: [ 'master', 'csfle' ]
8+
workflow_dispatch: {}
9+
10+
permissions:
11+
contents: write
12+
pull-requests: write
13+
id-token: write
14+
15+
jobs:
16+
run-tests:
17+
permissions:
18+
# required for all workflows
19+
security-events: write
20+
id-token: write
21+
contents: write
22+
runs-on: ubuntu-latest
23+
name: Encryption tests
24+
env:
25+
FORCE_COLOR: true
26+
steps:
27+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
28+
- name: Setup node
29+
uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0
30+
with:
31+
node-version: 22
32+
- name: Install Dependencies
33+
run: npm install
34+
- name: Install mongodb-client-encryption
35+
run: npm install mongodb-client-encryption
36+
- name: Setup Tests
37+
run: npm run setup-test-encryption
38+
- name: Run Tests
39+
run: npm run test-encryption

0 commit comments

Comments
 (0)