Skip to content

Commit

Permalink
[dist bin reactor] Update to jsdom@^7.2.2 since we now only support…
Browse files Browse the repository at this point in the history
… node@4 or greater.Rename to install-relevant-deps.sh. Update .travis.yml build matrix.
  • Loading branch information
indexzero committed Aug 22, 2017
1 parent ebeb2b7 commit baf702d
Show file tree
Hide file tree
Showing 3 changed files with 50 additions and 2 deletions.
28 changes: 27 additions & 1 deletion .travis.yml
Expand Up @@ -9,7 +9,7 @@ before_script:
- 'rm ./node_modules/.bin/npm 2>/dev/null || :'
- "./node_modules/.bin/lerna bootstrap"
- "./node_modules/.bin/lerna run build"
- "sh install-relevant-react.sh"
- "sh install-relevant-deps.sh"
- if [ -n "${KARMA-}" ]; then export CHROME_BIN=chromium-browser; export DISPLAY=:99.0; sh -e /etc/init.d/xvfb start; fi
script:
- 'if [ -n "${LINT-}" ]; then npm run lint; elif [ -n "${KARMA-}" ]; then npm run test:karma -- --single-run; elif [ -n "${REACT-}" ]; then npm run travis; else false ; fi'
Expand All @@ -31,6 +31,27 @@ matrix:
env: KARMA=true REACT=15
- node_js: "6"
env: KARMA=true REACT=16
exclude:
- node_js: "4"
env: JSDOM=10 REACT=0.13
- node_js: "4"
env: JSDOM=10 REACT=0.14
- node_js: "4"
env: JSDOM=10 REACT=15.4
- node_js: "4"
env: JSDOM=10 REACT=15
- node_js: "4"
env: JSDOM=10 REACT=16
- node_js: "4"
env: JSDOM=11 REACT=0.13
- node_js: "4"
env: JSDOM=11 REACT=0.14
- node_js: "4"
env: JSDOM=11 REACT=15.4
- node_js: "4"
env: JSDOM=11 REACT=15
- node_js: "4"
env: JSDOM=11 REACT=16
allow_failures:
- node_js: "6"
env: KARMA=true REACT=16
Expand All @@ -40,3 +61,8 @@ env:
- REACT=15.4
- REACT=15
- REACT=16
- JSDOM=7
- JSDOM=8
- JSDOM=9
- JSDOM=10
- JSDOM=11
22 changes: 22 additions & 0 deletions install-relevant-react.sh → install-relevant-deps.sh
Expand Up @@ -23,3 +23,25 @@ fi
if [ "$REACT" = "16" ]; then
npm run react:16
fi

JSDOM=${JSDOM:-7}

if [ "$JSDOM" = "7" ]; then
npm run env -- jsdom:7
fi

if [ "$JSDOM" = "8" ]; then
npm run env -- jsdom:8
fi

if [ "$JSDOM" = "9" ]; then
npm run env -- jsdom:9
fi

if [ "$JSDOM" = "10" ]; then
npm run env -- jsdom:10
fi

if [ "$JSDOM" = "11" ]; then
npm run env -- jsdom:11
fi
2 changes: 1 addition & 1 deletion package.json
Expand Up @@ -78,7 +78,7 @@
"gitbook-cli": "^1.0.1",
"in-publish": "^2.0.0",
"istanbul": "^1.0.0-alpha.2",
"jsdom": "^6.1.0",
"jsdom": "^7.2.2",
"json-loader": "^0.5.4",
"karma": "^1.3.0",
"karma-chrome-launcher": "^1.0.1",
Expand Down

0 comments on commit baf702d

Please sign in to comment.