Skip to content

Commit 4d75481

Browse files
test(NODE-4357): delete windows tests (#510)
1 parent 4d13309 commit 4d75481

File tree

5 files changed

+17
-72
lines changed

5 files changed

+17
-72
lines changed

Diff for: .evergreen/config.yml

-7
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,6 @@ functions:
3030
CURRENT_VERSION=latest
3131
fi
3232
export PROJECT_DIRECTORY="$(pwd)"
33-
if [ "Windows_NT" = "$OS" ]; then
34-
export PROJECT_DIRECTORY=$(cygpath -m $PROJECT_DIRECTORY)
35-
fi
3633
3734
# get the latest version of node for given major version
3835
NODE_VERSION=$(curl -sL nodejs.org/download/release/latest-v${NODE_MAJOR_VERSION}.x/SHASUMS256.txt -o - | head -n 1 | tr -s ' ' | cut -d' ' -f2 | cut -d- -f2 | cut -dv -f2)
@@ -214,10 +211,6 @@ buildvariants:
214211
display_name: MacOS 10.14
215212
run_on: macos-1014
216213
tasks: [".node"]
217-
- name: windows
218-
display_name: Windows 64
219-
run_on: windows-64-vsMulti-small
220-
tasks: [".node"]
221214
- name: lint
222215
display_name: lint
223216
run_on: rhel70

Diff for: .evergreen/init-nvm.sh

+1-13
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,6 @@ export PATH="/opt/mongodbtoolchain/v2/bin:$PATH"
44
NODE_ARTIFACTS_PATH="${PROJECT_DIRECTORY}/node-artifacts"
55
export NVM_DIR="${NODE_ARTIFACTS_PATH}/nvm"
66

7-
if [[ "$OS" == "Windows_NT" ]]; then
8-
NVM_HOME=$(cygpath -w "$NVM_DIR")
9-
export NVM_HOME
10-
NVM_SYMLINK=$(cygpath -w "$NODE_ARTIFACTS_PATH/bin")
11-
export NVM_SYMLINK
12-
NVM_ARTIFACTS_PATH=$(cygpath -w "$NODE_ARTIFACTS_PATH/bin")
13-
export NVM_ARTIFACTS_PATH
14-
PATH=$(cygpath $NVM_SYMLINK):$(cygpath $NVM_HOME):$PATH
15-
export PATH
16-
echo "updated path on windows PATH=$PATH"
17-
else
18-
[ -s "$NVM_DIR/nvm.sh" ] && source "$NVM_DIR/nvm.sh"
19-
fi
7+
[ -s "$NVM_DIR/nvm.sh" ] && source "$NVM_DIR/nvm.sh"
208

219
export NODE_OPTIONS="--trace-deprecation --trace-warnings"

Diff for: .evergreen/install-dependencies.sh

+11-42
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ NODE_ARTIFACTS_PATH="${PROJECT_DIRECTORY}/node-artifacts"
1010
NPM_CACHE_DIR="${NODE_ARTIFACTS_PATH}/npm"
1111
NPM_TMP_DIR="${NODE_ARTIFACTS_PATH}/tmp"
1212
BIN_DIR="$(pwd)/bin"
13-
NVM_WINDOWS_URL="https://github.com/coreybutler/nvm-windows/releases/download/1.1.9/nvm-noinstall.zip"
1413
NVM_URL="https://raw.githubusercontent.com/creationix/nvm/v0.38.0/install.sh"
1514

1615
# this needs to be explicitly exported for the nvm install below
@@ -28,51 +27,21 @@ export PATH="${BIN_DIR}:${PATH}"
2827

2928
# install Node.js
3029
echo "Installing Node ${NODE_LTS_NAME}"
31-
if [ "$OS" == "Windows_NT" ]; then
32-
set +o xtrace
3330

34-
export NVM_HOME=`cygpath -w "$NVM_DIR"`
35-
export NVM_SYMLINK=`cygpath -w "$NODE_ARTIFACTS_PATH/bin"`
36-
export PATH=`cygpath $NVM_SYMLINK`:`cygpath $NVM_HOME`:$PATH
31+
set +o xtrace
3732

38-
# download and install nvm
39-
curl -L $NVM_WINDOWS_URL -o nvm.zip
40-
unzip -d $NVM_DIR nvm.zip
41-
rm nvm.zip
33+
echo " Downloading nvm"
34+
curl -o- $NVM_URL | bash
35+
[ -s "${NVM_DIR}/nvm.sh" ] && \. "${NVM_DIR}/nvm.sh"
4236

43-
chmod 777 $NVM_DIR
44-
chmod -R a+rx $NVM_DIR
37+
echo "Running: nvm install --lts --latest-npm"
38+
nvm install --lts --latest-npm
39+
echo "Running: nvm install ${NODE_VERSION}"
40+
nvm install "${NODE_VERSION}"
41+
echo "Running: nvm use --lts"
42+
nvm use --lts
4543

46-
cat <<EOT > $NVM_DIR/settings.txt
47-
root: $NVM_HOME
48-
path: $NVM_SYMLINK
49-
EOT
50-
51-
echo "Running: nvm install lts"
52-
nvm install lts
53-
echo "Running: nvm install ${NODE_VERSION}"
54-
nvm install "${NODE_VERSION}"
55-
echo "Running: nvm use lts"
56-
nvm use lts
57-
echo "Running: npm install -g [email protected]"
58-
npm install -g [email protected] # https://github.com/npm/cli/issues/4341
59-
set -o xtrace
60-
else
61-
set +o xtrace
62-
63-
echo " Downloading nvm"
64-
curl -o- $NVM_URL | bash
65-
[ -s "${NVM_DIR}/nvm.sh" ] && \. "${NVM_DIR}/nvm.sh"
66-
67-
echo "Running: nvm install --lts --latest-npm"
68-
nvm install --lts --latest-npm
69-
echo "Running: nvm install ${NODE_VERSION}"
70-
nvm install "${NODE_VERSION}"
71-
echo "Running: nvm use --lts"
72-
nvm use --lts
73-
74-
set -o xtrace
75-
fi
44+
set -o xtrace
7645

7746

7847

Diff for: .evergreen/run-tests.sh

+4-9
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,10 @@ fi
66

77
NODE_ARTIFACTS_PATH="${PROJECT_DIRECTORY}/node-artifacts"
88

9-
if [ "$OS" == "Windows_NT" ]; then
10-
export NVM_HOME=`cygpath -w "$NODE_ARTIFACTS_PATH/nvm"`
11-
export NVM_SYMLINK=`cygpath -w "$NODE_ARTIFACTS_PATH/bin"`
12-
export PATH=`cygpath $NVM_SYMLINK`:`cygpath $NVM_HOME`:$PATH
13-
else
14-
export PATH="/opt/mongodbtoolchain/v2/bin:$PATH"
15-
export NVM_DIR="${NODE_ARTIFACTS_PATH}/nvm"
16-
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
17-
fi
9+
export PATH="/opt/mongodbtoolchain/v2/bin:$PATH"
10+
export NVM_DIR="${NODE_ARTIFACTS_PATH}/nvm"
11+
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
12+
1813

1914
case $1 in
2015
"node")

Diff for: test/bson_older_versions_tests.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ describe('Mutual version and distribution compatibility', function () {
181181
fromObjects = makeObjects(fromBSON);
182182
},
183183
err => {
184-
if (+process.version.slice(1).split('.')[0] >= 12 && process.platform !== 'win32') {
184+
if (+process.version.slice(1).split('.')[0] >= 12) {
185185
throw err; // On Node.js 12+, all loading is expected to work.
186186
} else {
187187
this.skip(); // Otherwise, e.g. ESM can't be loaded, so just skip.

0 commit comments

Comments
 (0)