Skip to content

Commit ad803cb

Browse files
committed
chore: remove unused expansion
1 parent e0d0ff2 commit ad803cb

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
@@ -191,7 +191,7 @@ functions:
191191
MONGODB_URI="${MONGODB_URI}" \
192192
AUTH=${AUTH} SSL=${SSL} TEST_CSFLE=true \
193193
MONGODB_API_VERSION="${MONGODB_API_VERSION}" \
194-
NODE_VERSION=${NODE_VERSION} SKIP_DEPS=${SKIP_DEPS|1} \
194+
SKIP_DEPS=${SKIP_DEPS|1} \
195195
bash ${PROJECT_DIRECTORY}/.evergreen/run-tests.sh
196196
197197
"run serverless tests":
@@ -291,7 +291,6 @@ functions:
291291
AUTH=${AUTH} \
292292
SSL=${SSL} \
293293
MONGODB_API_VERSION="${MONGODB_API_VERSION}" \
294-
NODE_VERSION=${NODE_VERSION} \
295294
SINGLE_MONGOS_LB_URI="${SINGLE_MONGOS_LB_URI}" \
296295
MULTI_MONGOS_LB_URI="${MULTI_MONGOS_LB_URI}" \
297296
TOPOLOGY="${TOPOLOGY}" \
@@ -312,7 +311,6 @@ functions:
312311
AUTH=${AUTH} \
313312
SSL=${SSL} \
314313
MONGODB_API_VERSION="${MONGODB_API_VERSION}" \
315-
NODE_VERSION=${NODE_VERSION} \
316314
TOPOLOGY="${TOPOLOGY}" \
317315
COMPRESSOR="${COMPRESSOR}" \
318316
SKIP_DEPS=${SKIP_DEPS|1} \
@@ -457,9 +455,6 @@ functions:
457455
${PREPARE_SHELL}
458456
NODE_LTS_NAME=${NODE_LTS_NAME} NPM_OPTIONS=${NPM_OPTIONS}\
459457
bash ${PROJECT_DIRECTORY}/.evergreen/install-dependencies.sh
460-
- command: expansions.update
461-
params:
462-
file: src/deps-expansion.yml
463458
464459
"install aws-credential-providers":
465460
- command: shell.exec

.evergreen/config.yml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ functions:
161161
MONGODB_URI="${MONGODB_URI}" \
162162
AUTH=${AUTH} SSL=${SSL} TEST_CSFLE=true \
163163
MONGODB_API_VERSION="${MONGODB_API_VERSION}" \
164-
NODE_VERSION=${NODE_VERSION} SKIP_DEPS=${SKIP_DEPS|1} \
164+
SKIP_DEPS=${SKIP_DEPS|1} \
165165
bash ${PROJECT_DIRECTORY}/.evergreen/run-tests.sh
166166
run serverless tests:
167167
- command: timeout.update
@@ -257,7 +257,6 @@ functions:
257257
AUTH=${AUTH} \
258258
SSL=${SSL} \
259259
MONGODB_API_VERSION="${MONGODB_API_VERSION}" \
260-
NODE_VERSION=${NODE_VERSION} \
261260
SINGLE_MONGOS_LB_URI="${SINGLE_MONGOS_LB_URI}" \
262261
MULTI_MONGOS_LB_URI="${MULTI_MONGOS_LB_URI}" \
263262
TOPOLOGY="${TOPOLOGY}" \
@@ -277,7 +276,6 @@ functions:
277276
AUTH=${AUTH} \
278277
SSL=${SSL} \
279278
MONGODB_API_VERSION="${MONGODB_API_VERSION}" \
280-
NODE_VERSION=${NODE_VERSION} \
281279
TOPOLOGY="${TOPOLOGY}" \
282280
COMPRESSOR="${COMPRESSOR}" \
283281
SKIP_DEPS=${SKIP_DEPS|1} \
@@ -407,9 +405,6 @@ functions:
407405
${PREPARE_SHELL}
408406
NODE_LTS_NAME=${NODE_LTS_NAME} NPM_OPTIONS=${NPM_OPTIONS}\
409407
bash ${PROJECT_DIRECTORY}/.evergreen/install-dependencies.sh
410-
- command: expansions.update
411-
params:
412-
file: src/deps-expansion.yml
413408
install aws-credential-providers:
414409
- command: shell.exec
415410
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)