Skip to content

Commit 351cc19

Browse files
committed
chore: catch more npm version settings
1 parent 905101e commit 351cc19

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

.evergreen/config.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4842,7 +4842,7 @@ buildvariants:
48424842
run_on: rhel80-large
48434843
expansions:
48444844
NODE_LTS_VERSION: 18
4845-
NPM_VERSION: latest
4845+
NPM_VERSION: 10
48464846
CLIENT_ENCRYPTION: true
48474847
tasks:
48484848
- test-latest-server
@@ -5123,7 +5123,7 @@ buildvariants:
51235123
run_on: windows-vsCurrent-large
51245124
expansions:
51255125
NODE_LTS_VERSION: 18
5126-
NPM_VERSION: latest
5126+
NPM_VERSION: 10
51275127
tasks:
51285128
- test-latest-server
51295129
- test-latest-replica_set

.evergreen/generate_evergreen_tasks.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -416,7 +416,8 @@ for (const {
416416
const nodeLtsDisplayName = `Node${NODE_LTS_VERSION}`;
417417
const name = `${osName}-${NODE_LTS_VERSION >= 20 ? nodeLtsDisplayName : nodeLTSCodeName}`;
418418
const display_name = `${osDisplayName} ${nodeLtsDisplayName}`;
419-
const expansions = { NODE_LTS_VERSION, NPM_VERSION: NODE_LTS_VERSION === 16 ? 9 : NODE_LTS_VERSION === 18 ? 10 : 'latest' };
419+
const NPM_VERSION = versions.find(({versionNumber}) => versionNumber === NODE_LTS_VERSION).npmVersion;
420+
const expansions = { NODE_LTS_VERSION, NPM_VERSION };
420421
const taskNames = tasks.map(({ name }) => name);
421422

422423
if (clientEncryption) {

0 commit comments

Comments
 (0)