Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions .evergreen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@

stepback: false

# Upper bound on any shell.exec task. 30 min should be plenty of time.
exec_timeout_secs: 1800

variables:
# function "save release variants" is conditional on the following
# -> all except ubuntu
Expand Down Expand Up @@ -129,12 +132,12 @@ functions:
# ${npm|npm} run check
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

bug

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good grief
On Apr 28, 2016 8:29 AM, "Lucas Hrabovsky" notifications@github.com wrote:

In .evergreen.yml
#368 (comment):

@@ -129,12 +132,12 @@ functions:
# ${npm|npm} run check

     # Create a release build
  •    ${npm|npm} run release;
    

bug


You are receiving this because you modified the open/close state.
Reply to this email directly or view it on GitHub
https://github.com/10gen/compass/pull/368/files/1aeddb3af40e1ed8a357259ff4f0f908e92fef11#r61418353

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, not a bug. See next line below. I simply removed the ${npm|npm} noise in this commit.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah and by removing it it points to the wrong npm installation.

Copy link
Contributor Author

@kangas kangas Apr 28, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we never define "npm" as an evergreen expansion, so the literal "npm" is always used.

PATH is set correctly at the top of the shell.exec script as follows:

export PATH="${node_path}:$PATH"


# Create a release build
${npm|npm} run release;

npm run release;
ls -alh dist/

# Test the release build
${npm|npm} run test-unit;
npm run test-unit;
# npm run test
EOF_BUILD_SH

#
Expand Down Expand Up @@ -378,6 +381,7 @@ buildvariants:
expansions:
build_via_local_tunnel: true
fetch_npm_tarball: node-v5.5.0-npm-3.3.12-darwin-x64.tgz
killall_evergreen: 'pkill -9 Electron; pkill -9 mongod; pkill -9 mongos; pkill -9 mongo'
node_path: "$(pwd)/.deps/bin"
num_cores: $(sysctl -n hw.logicalcpu)
tasks:
Expand All @@ -390,6 +394,7 @@ buildvariants:
- "windows-64-vs2013-test"
expansions:
fetch_npm_tarball: node-v5.5.0-npm-3.3.12-windows-x64.tgz
killall_evergreen: 'pkill -9 Electron; pkill -9 mongod; pkill -9 mongos; pkill -9 mongo'
node_path: "$(pwd)/.deps"
num_cores: $(grep -c ^processor /proc/cpuinfo)
add_env_appdata: Z:\
Expand All @@ -403,6 +408,7 @@ buildvariants:
- "ubuntu1404-test"
expansions:
fetch_npm_tarball: node-v5.5.0-npm-3.3.12-linux-x64.tgz
killall_evergreen: 'pkill -9 electron; pkill -9 mongod; pkill -9 mongos; pkill -9 mongo'
node_path: "$(pwd)/.deps/bin"
compile_env: CC=/opt/mongodbtoolchain/bin/gcc CXX=/opt/mongodbtoolchain/bin/g++
num_cores: $(grep -c ^processor /proc/cpuinfo)
Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@
"ci": "npm run test",
"clean": "hadron-build clean",
"compile-ui": "hadron-build ui",
"pretest": "mongodb-runner start && mongodb-runner stop",
"fmt": "mongodb-js-fmt ./*.js src/{**/*.js,*.js} test/{**/*.js,*.js}",
"release": "hadron-build release",
"test-functional": "npm test -- --functional",
Expand Down