Skip to content

Commit 6f22a7f

Browse files
committed
INT-783 evergreen: Node 4 on windows
1 parent c16e4fc commit 6f22a7f

File tree

1 file changed

+4
-38
lines changed

1 file changed

+4
-38
lines changed

.evergreen.yml

Lines changed: 4 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,6 @@
99
stepback: false
1010

1111
variables:
12-
# function "fetch npm tarball" is conditional on {fetch_npm_tarball}
13-
# -> all except windows
14-
15-
# function "upgrade npm windows" is conditional based on {upgrade_npm_version}
16-
# as set in the buildvariant declaration
17-
# -> only windows
18-
1912
# function "save release variants" is conditional on the following
2013
# -> all except ubuntu
2114
- &save_release_variants
@@ -57,42 +50,19 @@ functions:
5750
script: |
5851
mkdir -p .deps
5952
set -ev
60-
if [ -z "${fetch_npm_tarball|}" ]; then
61-
echo "fetch_npm_tarball: fetch_npm_tarball is unset; skipping"
62-
exit 0
63-
fi
6453
curl -fs \
6554
-o ".deps/${fetch_npm_tarball}" \
6655
--url "http://mongodb-dx-public.s3.amazonaws.com/evergreen-deps/${fetch_npm_tarball}"
6756
cd .deps
6857
tar xzf ${fetch_npm_tarball} --strip-components=1
6958
70-
# THIS COMMAND WORKS ON WINDOWS ONLY, SHOULD BE CONSIDERED OBSOLETE
71-
# To use "npm" installed by this, each shell.exec script must add:
72-
# export PATH="`npm -g bin`:$PATH"
73-
"upgrade npm windows" : &upgrade_npm_windows
74-
command: shell.exec
75-
params:
76-
working_dir: src
77-
script: |
78-
if [ -z "${upgrade_npm_version|}" ]; then
79-
echo "upgrade_npm: upgrade_npm_version is unset; skipping"
80-
exit 0
81-
fi
82-
set -ev
83-
test -n "${node_environment|}" && export "${node_environment|}"
84-
export PATH="$PATH:${node_path|}"
85-
${npm|npm} install -g npm@${upgrade_npm_version|xx}
86-
8759
"npm install" :
8860
command: shell.exec
8961
params:
9062
working_dir: src
9163
script: |
9264
set -ev
93-
test -n "${node_environment|}" && export "${node_environment|}"
94-
export PATH="$PATH:${node_path|}"
95-
export PATH="`npm -g bin`:$PATH"
65+
export PATH="${node_path}:$PATH"
9666
${node|node} --version
9767
${npm|npm} --version
9868
${npm|npm} config set loglevel error
@@ -106,9 +76,7 @@ functions:
10676
working_dir: src
10777
script: |
10878
set -ev
109-
test -n "${node_environment|}" && export "${node_environment|}"
110-
export PATH="$PATH:${node_path|}"
111-
export PATH="`npm -g bin`:$PATH"
79+
export PATH="${node_path}:$PATH"
11280
export CI=1 EVERGREEN=1
11381
test -n "${add_environment|}" && export ${add_environment|}
11482
${npm|npm} run ci
@@ -160,7 +128,6 @@ tasks:
160128
commands:
161129
- func: "fetch source"
162130
- func: "fetch npm tarball"
163-
- func: "upgrade npm windows"
164131
- func: "npm install"
165132
- func: "build"
166133
- func: "save release"
@@ -195,9 +162,8 @@ buildvariants:
195162
run_on:
196163
- "windows-64-vs2013-test"
197164
expansions:
198-
node_environment: "APPDATA=C:\\Program Files (x86)\\nodejs\\node_modules"
199-
upgrade_npm_version: "3"
200-
node_path: "/cygdrive/c/Program Files (x86)/nodejs"
165+
fetch_npm_tarball: node-v4.2.2-npm-3.3.12-windows-x64.tgz
166+
node_path: "$(pwd)/.deps"
201167
installer_content_type: "application/octet-stream"
202168
installer_filename: "MongoDBCompassSetup.exe"
203169
num_cores: $(grep -c ^processor /proc/cpuinfo)

0 commit comments

Comments
 (0)