Skip to content

Commit

Permalink
Node 6 and NPM 4 (#8081)
Browse files Browse the repository at this point in the history
* upgrade node to version 6

* upgrade npm to v4

* update shrinkwrap

* use npm 4 in travis

* use mongoose 4.6.4

* update shrinkwrap

* fix async test and upgrade mongoose

* fix amazon test

* remove debugging code

* working tests with separate server

* update coupon code

* mupdate mongoose

* nvm: relax node version in .nvmrc
  • Loading branch information
paglias committed Dec 12, 2016
1 parent 66d402c commit 5dbaf39
Show file tree
Hide file tree
Showing 8 changed files with 194 additions and 162 deletions.
2 changes: 1 addition & 1 deletion .ebextensions/deploy.config
Expand Up @@ -14,7 +14,7 @@ files:
owner: root
group: users
content: |
$(ls -td /opt/elasticbeanstalk/node-install/node-* | head -1)/bin/npm install -g npm@3
$(ls -td /opt/elasticbeanstalk/node-install/node-* | head -1)/bin/npm install -g npm@4
container_commands:
01_makeBabel:
command: "touch /tmp/.babel.json"
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
@@ -1 +1 @@
4.3.1
6
4 changes: 2 additions & 2 deletions .travis.yml
@@ -1,8 +1,8 @@
language: node_js
node_js:
- '4.3.1'
- '6'
before_install:
- npm install -g npm@3
- npm install -g npm@4
- if [ $REQUIRES_SERVER ]; then sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 7F0CEB10; echo 'deb http://downloads-distro.mongodb.org/repo/ubuntu-upstart dist 10gen' | sudo tee /etc/apt/sources.list.d/mongodb.list; sudo apt-get update; sudo apt-get install mongodb-org-server; fi
before_script:
- npm run test:build
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Expand Up @@ -17,15 +17,15 @@ RUN apt-get install -y \
python

# Install NodeJS
RUN curl -sL https://deb.nodesource.com/setup_4.x | sudo -E bash -
RUN curl -sL https://deb.nodesource.com/setup_6.x | sudo -E bash -
RUN apt-get install -y nodejs

# Clean up package management
RUN apt-get clean
RUN rm -rf /var/lib/apt/lists/*

# Install global packages
RUN npm install -g npm@3
RUN npm install -g npm@4
RUN npm install -g gulp grunt-cli bower

# Clone Habitica repo and install dependencies
Expand Down
2 changes: 1 addition & 1 deletion gulp/gulp-tests.js
Expand Up @@ -318,7 +318,7 @@ gulp.task('test:api-v3:integration:watch', () => {

gulp.task('test:api-v3:integration:separate-server', (done) => {
let runner = exec(
testBin('mocha test/api/v3/integration --recursive', 'LOAD_SERVER=0'),
testBin('mocha test/api/v3/integration --recursive --require ./test/helpers/start-server', 'LOAD_SERVER=0'),
{maxBuffer: 500 * 1024},
(err, stdout, stderr) => done(err)
);
Expand Down

0 comments on commit 5dbaf39

Please sign in to comment.