Skip to content

Commit b29655f

Browse files
baileympearsonbaileympearson
committed
finish merge
1 parent 9e87db0 commit b29655f

File tree

3 files changed

+32
-46
lines changed

3 files changed

+32
-46
lines changed

‎.evergreen/config.yml‎

Lines changed: 23 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -3453,7 +3453,7 @@ tasks:
34533453
- {key: NPM_VERSION, value: '9'}
34543454
- func: install dependencies
34553455
- func: run lint checks
3456-
- name: check-types-typescript-next-node-types-20.12.7
3456+
- name: check-types-typescript-next-node-types-20.14.10
34573457
tags:
34583458
- check-types-typescript-next
34593459
- typescript-compilation
@@ -3465,12 +3465,12 @@ tasks:
34653465
- {key: NODE_LTS_VERSION, value: '16'}
34663466
- {key: NPM_VERSION, value: '9'}
34673467
- {key: TS_VERSION, value: next}
3468-
- {key: TYPES_VERSION, value: 20.12.7}
3468+
- {key: TYPES_VERSION, value: 20.14.10}
34693469
- func: install dependencies
34703470
- func: check types
3471-
- name: compile-driver-typescript-current-node-types-20.12.7
3471+
- name: check-types-typescript-current-node-types-20.14.10
34723472
tags:
3473-
- compile-driver-typescript-current
3473+
- check-types-typescript-current
34743474
- typescript-compilation
34753475
commands:
34763476
- command: expansions.update
@@ -3480,12 +3480,12 @@ tasks:
34803480
- {key: NODE_LTS_VERSION, value: '16'}
34813481
- {key: NPM_VERSION, value: '9'}
34823482
- {key: TS_VERSION, value: current}
3483-
- {key: TYPES_VERSION, value: 20.12.7}
3483+
- {key: TYPES_VERSION, value: 20.14.10}
34843484
- func: install dependencies
3485-
- func: compile driver
3486-
- name: check-types-typescript-current-node-types-20.12.7
3485+
- func: check types
3486+
- name: check-types-typescript-next-node-types-16.x
34873487
tags:
3488-
- check-types-typescript-current
3488+
- check-types-typescript-next
34893489
- typescript-compilation
34903490
commands:
34913491
- command: expansions.update
@@ -3494,13 +3494,13 @@ tasks:
34943494
updates:
34953495
- {key: NODE_LTS_VERSION, value: '16'}
34963496
- {key: NPM_VERSION, value: '9'}
3497-
- {key: TS_VERSION, value: current}
3498-
- {key: TYPES_VERSION, value: 20.12.7}
3497+
- {key: TS_VERSION, value: next}
3498+
- {key: TYPES_VERSION, value: 16.x}
34993499
- func: install dependencies
35003500
- func: check types
3501-
- name: check-types-typescript-4.4-node-types-20.12.7
3501+
- name: check-types-typescript-current-node-types-16.x
35023502
tags:
3503-
- check-types-typescript-4.4
3503+
- check-types-typescript-current
35043504
- typescript-compilation
35053505
commands:
35063506
- command: expansions.update
@@ -3509,13 +3509,13 @@ tasks:
35093509
updates:
35103510
- {key: NODE_LTS_VERSION, value: '16'}
35113511
- {key: NPM_VERSION, value: '9'}
3512-
- {key: TS_VERSION, value: '4.4'}
3513-
- {key: TYPES_VERSION, value: 20.12.7}
3512+
- {key: TS_VERSION, value: current}
3513+
- {key: TYPES_VERSION, value: 16.x}
35143514
- func: install dependencies
35153515
- func: check types
3516-
- name: check-types-typescript-next-node-types-16.x
3516+
- name: check-types-typescript-4.4-node-types-18.11.9
35173517
tags:
3518-
- check-types-typescript-next
3518+
- check-types-typescript-4.4
35193519
- typescript-compilation
35203520
commands:
35213521
- command: expansions.update
@@ -3524,11 +3524,11 @@ tasks:
35243524
updates:
35253525
- {key: NODE_LTS_VERSION, value: '16'}
35263526
- {key: NPM_VERSION, value: '9'}
3527-
- {key: TS_VERSION, value: next}
3528-
- {key: TYPES_VERSION, value: 16.x}
3527+
- {key: TS_VERSION, value: '4.4'}
3528+
- {key: TYPES_VERSION, value: 18.11.9}
35293529
- func: install dependencies
35303530
- func: check types
3531-
- name: compile-driver-typescript-current-node-types-16.x
3531+
- name: compile-driver-typescript-current-node-types-20.14.10
35323532
tags:
35333533
- compile-driver-typescript-current
35343534
- typescript-compilation
@@ -3540,12 +3540,12 @@ tasks:
35403540
- {key: NODE_LTS_VERSION, value: '16'}
35413541
- {key: NPM_VERSION, value: '9'}
35423542
- {key: TS_VERSION, value: current}
3543-
- {key: TYPES_VERSION, value: 16.x}
3543+
- {key: TYPES_VERSION, value: 20.14.10}
35443544
- func: install dependencies
35453545
- func: compile driver
3546-
- name: check-types-typescript-current-node-types-16.x
3546+
- name: compile-driver-typescript-current-node-types-16.x
35473547
tags:
3548-
- check-types-typescript-current
3548+
- compile-driver-typescript-current
35493549
- typescript-compilation
35503550
commands:
35513551
- command: expansions.update
@@ -3557,22 +3557,7 @@ tasks:
35573557
- {key: TS_VERSION, value: current}
35583558
- {key: TYPES_VERSION, value: 16.x}
35593559
- func: install dependencies
3560-
- func: check types
3561-
- name: check-types-typescript-4.4-node-types-16.x
3562-
tags:
3563-
- check-types-typescript-4.4
3564-
- typescript-compilation
3565-
commands:
3566-
- command: expansions.update
3567-
type: setup
3568-
params:
3569-
updates:
3570-
- {key: NODE_LTS_VERSION, value: '16'}
3571-
- {key: NPM_VERSION, value: '9'}
3572-
- {key: TS_VERSION, value: '4.4'}
3573-
- {key: TYPES_VERSION, value: 16.x}
3574-
- func: install dependencies
3575-
- func: check types
3560+
- func: compile driver
35763561
- name: download-and-merge-coverage
35773562
tags: []
35783563
commands:

‎.evergreen/generate_evergreen_tasks.js‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -532,14 +532,16 @@ function* makeTypescriptTasks() {
532532

533533
const typesVersion = require('../package.json').devDependencies['@types/node'].slice(1)
534534
yield makeCheckTypesTask('next', typesVersion);
535-
yield makeCompileTask('current', typesVersion);
536535
yield makeCheckTypesTask('current', typesVersion);
537-
yield makeCheckTypesTask('4.4', typesVersion);
538536

539537
yield makeCheckTypesTask('next', '16.x');
540-
yield makeCompileTask('current', '16.x');
541538
yield makeCheckTypesTask('current', '16.x');
542-
yield makeCheckTypesTask('4.4', '16.x');
539+
540+
// typescript 4.4 only compiles our types with this particular version
541+
yield makeCheckTypesTask('4.4', '18.11.9');
542+
543+
yield makeCompileTask('current', typesVersion);
544+
yield makeCompileTask('current', '16.x');
543545
}
544546

545547
BUILD_VARIANTS.push({

‎.evergreen/run-typescript.sh‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ set -o errexit # Exit the script with error if any of the commands fail
33

44
source "${PROJECT_DIRECTORY}/.evergreen/init-node-and-npm-env.sh"
55

6-
set -o xtrace
7-
86
case $TS_CHECK in
97
COMPILE_DRIVER|CHECK_TYPES) # Ok
108
;;
@@ -32,10 +30,11 @@ function get_ts_version() {
3230
export TSC="./node_modules/typescript/bin/tsc"
3331
export TS_VERSION=$(get_ts_version)
3432

35-
# On old versions of TS we need to put the node types back to 18.11.19
36-
npm install --no-save --force typescript@"$TS_VERSION" "@types/node@$TYPES_VERSION"
33+
npm install --no-save --force "typescript@$TS_VERSION" "@types/node@$TYPES_VERSION"
3734

3835
echo "Typescript $($TSC -v)"
36+
echo "Types: $(cat node_modules/@types/node/package.json | jq -r .version)"
37+
echo "Nodejs: $(node -v)"
3938

4039
# check resolution uses the default latest types
4140
echo "import * as mdb from '.'" > file.ts && node $TSC --noEmit --traceResolution file.ts | grep 'mongodb.d.ts' && rm file.ts

0 commit comments

Comments
 (0)