Merge branch 'main' into NODE-7319/oidc-allowed-hosts

baileympearson · web-flow · commit 001f2f7ec6c4 · 2025-12-01T12:31:59.000-07:00
diff --git a/.evergreen/config.yml b/.evergreen/config.yml
@@ -1877,19 +1877,6 @@ tasks:
       - func: install dependencies
       - func: bootstrap mongo-orchestration
       - func: check resource management feature integration
-  - name: check-types-typescript-next
-    tags:
-      - check-types-typescript-next
-      - typescript-compilation
-    commands:
-      - command: expansions.update
-        type: setup
-        params:
-          updates:
-            - {key: NODE_LTS_VERSION, value: 20.19.0}
-            - {key: TS_VERSION, value: next}
-      - func: install dependencies
-      - func: check types
   - name: check-types-typescript-current
     tags:
       - check-types-typescript-current
diff --git a/.evergreen/generate_evergreen_tasks.js b/.evergreen/generate_evergreen_tasks.js
@@ -532,7 +532,8 @@ function* makeTypescriptTasks() {
     };
   }
 
-  yield makeCheckTypesTask('next');
+  // TODO(NODE-7233): unskip ts@next tests once we adopt Typescript 6.0.
+  // yield makeCheckTypesTask('next');
   yield makeCheckTypesTask('current');
   yield makeCheckTypesTask('5.6');
 
diff --git a/drivers-evergreen-tools b/drivers-evergreen-tools
@@ -1 +1 @@
-Subproject commit f8ab2a54f774cab1e92bcf222949181baf8b2f1c
+Subproject commit cb019f7e989f590ca1c0620f161443cf6f8c8b56

Original file line number	Diff line number	Diff line change
`@@ -532,7 +532,8 @@ function* makeTypescriptTasks() {`
`532`	`532`	`};`
`533`	`533`	`}`
`534`	`534`
`535`		`- yield makeCheckTypesTask('next');`
	`535`	`+ // TODO(NODE-7233): unskip ts@next tests once we adopt Typescript 6.0.`
	`536`	`+ // yield makeCheckTypesTask('next');`
`536`	`537`	`yield makeCheckTypesTask('current');`
`537`	`538`	`yield makeCheckTypesTask('5.6');`
`538`	`539`