Skip to content

Commit 1736922

Browse files
committed
chore: remove unused expansion
1 parent 5a52e4b commit 1736922

File tree

4 files changed

+5
-25
lines changed

4 files changed

+5
-25
lines changed

.evergreen/config.in.yml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ functions:
195195
MONGODB_URI="${MONGODB_URI}" \
196196
AUTH=${AUTH} SSL=${SSL} TEST_CSFLE=true \
197197
MONGODB_API_VERSION="${MONGODB_API_VERSION}" \
198-
NODE_VERSION=${NODE_VERSION} SKIP_DEPS=${SKIP_DEPS|1} \
198+
SKIP_DEPS=${SKIP_DEPS|1} \
199199
bash ${PROJECT_DIRECTORY}/.evergreen/run-tests.sh
200200
201201
"run serverless tests":
@@ -295,7 +295,6 @@ functions:
295295
AUTH=${AUTH} \
296296
SSL=${SSL} \
297297
MONGODB_API_VERSION="${MONGODB_API_VERSION}" \
298-
NODE_VERSION=${NODE_VERSION} \
299298
SINGLE_MONGOS_LB_URI="${SINGLE_MONGOS_LB_URI}" \
300299
MULTI_MONGOS_LB_URI="${MULTI_MONGOS_LB_URI}" \
301300
TOPOLOGY="${TOPOLOGY}" \
@@ -316,7 +315,6 @@ functions:
316315
AUTH=${AUTH} \
317316
SSL=${SSL} \
318317
MONGODB_API_VERSION="${MONGODB_API_VERSION}" \
319-
NODE_VERSION=${NODE_VERSION} \
320318
TOPOLOGY="${TOPOLOGY}" \
321319
COMPRESSOR="${COMPRESSOR}" \
322320
SKIP_DEPS=${SKIP_DEPS|1} \
@@ -461,9 +459,6 @@ functions:
461459
${PREPARE_SHELL}
462460
NODE_LTS_NAME=${NODE_LTS_NAME} NPM_OPTIONS=${NPM_OPTIONS}\
463461
bash ${PROJECT_DIRECTORY}/.evergreen/install-dependencies.sh
464-
- command: expansions.update
465-
params:
466-
file: src/deps-expansion.yml
467462
468463
"install aws-credential-providers":
469464
- command: shell.exec

.evergreen/config.yml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ functions:
165165
MONGODB_URI="${MONGODB_URI}" \
166166
AUTH=${AUTH} SSL=${SSL} TEST_CSFLE=true \
167167
MONGODB_API_VERSION="${MONGODB_API_VERSION}" \
168-
NODE_VERSION=${NODE_VERSION} SKIP_DEPS=${SKIP_DEPS|1} \
168+
SKIP_DEPS=${SKIP_DEPS|1} \
169169
bash ${PROJECT_DIRECTORY}/.evergreen/run-tests.sh
170170
run serverless tests:
171171
- command: timeout.update
@@ -261,7 +261,6 @@ functions:
261261
AUTH=${AUTH} \
262262
SSL=${SSL} \
263263
MONGODB_API_VERSION="${MONGODB_API_VERSION}" \
264-
NODE_VERSION=${NODE_VERSION} \
265264
SINGLE_MONGOS_LB_URI="${SINGLE_MONGOS_LB_URI}" \
266265
MULTI_MONGOS_LB_URI="${MULTI_MONGOS_LB_URI}" \
267266
TOPOLOGY="${TOPOLOGY}" \
@@ -281,7 +280,6 @@ functions:
281280
AUTH=${AUTH} \
282281
SSL=${SSL} \
283282
MONGODB_API_VERSION="${MONGODB_API_VERSION}" \
284-
NODE_VERSION=${NODE_VERSION} \
285283
TOPOLOGY="${TOPOLOGY}" \
286284
COMPRESSOR="${COMPRESSOR}" \
287285
SKIP_DEPS=${SKIP_DEPS|1} \
@@ -411,9 +409,6 @@ functions:
411409
${PREPARE_SHELL}
412410
NODE_LTS_NAME=${NODE_LTS_NAME} NPM_OPTIONS=${NPM_OPTIONS}\
413411
bash ${PROJECT_DIRECTORY}/.evergreen/install-dependencies.sh
414-
- command: expansions.update
415-
params:
416-
file: src/deps-expansion.yml
417412
install aws-credential-providers:
418413
- command: shell.exec
419414
type: setup

.evergreen/install-dependencies.sh

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

44
NODE_LTS_NAME=${NODE_LTS_NAME:-fermium}
55
NODE_ARTIFACTS_PATH="${PROJECT_DIRECTORY:-$(pwd)}/node-artifacts"
6-
if [[ "$OS" = "Windows_NT" ]]; then
7-
NODE_ARTIFACTS_PATH=$(cygpath --unix "$NODE_ARTIFACTS_PATH")
8-
fi
6+
if [[ "$OS" = "Windows_NT" ]]; then NODE_ARTIFACTS_PATH=$(cygpath --unix "$NODE_ARTIFACTS_PATH"); fi
97

108
mkdir -p "$NODE_ARTIFACTS_PATH/npm_global"
119

@@ -26,10 +24,6 @@ while IFS=$'\t' read -r -a row; do
2624
[[ "$NODE_LTS_NAME" = "$node_index_lts" ]] && break # case insensitive compare
2725
done < node_index.tab
2826

29-
cat <<EOT > deps-expansion.yml
30-
NODE_VERSION: "${node_index_version:1}" # :1 gets rid of the leading 'v'
31-
EOT
32-
3327
if [[ "$OS" = "Windows_NT" ]]; then
3428
operating_system="win"
3529
elif [[ $(uname) = "darwin" ]]; then
@@ -55,11 +49,8 @@ else
5549
exit 1
5650
fi
5751

58-
if [[ "$OS" = "Windows_NT" ]]; then
59-
file_extension="zip"
60-
else
61-
file_extension="tar.gz"
62-
fi
52+
file_extension="tar.gz"
53+
if [[ "$OS" = "Windows_NT" ]]; then file_extension="zip"; fi
6354

6455
node_directory="node-${node_index_version}-${operating_system}-${architecture}"
6556
node_archive="${node_directory}.${file_extension}"

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,5 +91,4 @@ etc/docs/build
9191

9292
node_index.tab
9393
node-artifacts
94-
deps-expansion.yml
9594
.npmrc

0 commit comments

Comments
 (0)