Skip to content

Commit

Permalink
[CI] enabled node 4 in Travis builds (#2370)
Browse files Browse the repository at this point in the history
  • Loading branch information
bestander authored Jan 3, 2017
1 parent fdade5d commit 9d1f04f
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 6 deletions.
19 changes: 15 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ language: node_js

node_js:
- "6"
- "4"

sudo: required # Until Yarn repo is added to apt-source-whitelist

Expand All @@ -30,27 +31,37 @@ env:
- TEST_TYPE="build-dist"
- TEST_TYPE="check-lockfile"
- TEST_TYPE="lint"
- NODE_VERSION="6" TEST_TYPE="test-ci"
- NODE_VERSION="4" TEST_TYPE="test-ci"
- TEST_TYPE="test-ci"

matrix:
exclude:
- env: TEST_TYPE="build-dist"
os: osx
- env: TEST_TYPE="build-dist"
node_js: "4"
- env: TEST_TYPE="check-lockfile"
os: osx
- env: TEST_TYPE="check-lockfile"
node_js: "4"
- env: TEST_TYPE="lint"
os: osx
- env: TEST_TYPE="lint"
node_js: "4"
- env: TEST_TYPE="test-ci"
os: osx
node_js: "4"

before_install:
- ./scripts/bootstrap-env-ubuntu.sh
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then ./scripts/bootstrap-env-ubuntu.sh; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install yarn; fi

install:
- node --version
- yarn install

os:
#- osx
- osx
- linux

script: yarn $TEST_TYPE
2 changes: 1 addition & 1 deletion __tests__/commands/add.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import semver from 'semver';
import {promisify} from '../../src/util/promise';
import fsNode from 'fs';

jasmine.DEFAULT_TIMEOUT_INTERVAL = 90000;
jasmine.DEFAULT_TIMEOUT_INTERVAL = 120000;

const path = require('path');

Expand Down
2 changes: 1 addition & 1 deletion __tests__/commands/install/integration-deduping.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import {getPackageVersion, runInstall} from '../_helpers.js';

const assert = require('assert');

jasmine.DEFAULT_TIMEOUT_INTERVAL = 90000;
jasmine.DEFAULT_TIMEOUT_INTERVAL = 120000;

test.concurrent('install should dedupe dependencies avoiding conflicts 0', (): Promise<void> => {
// [email protected] -> [email protected]
Expand Down
1 change: 1 addition & 0 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ build_script:
- npm run build-win-installer

test_script:
- node --version
- npm run test-only

artifacts:
Expand Down

0 comments on commit 9d1f04f

Please sign in to comment.