Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
Next Next commit
tests: use stages for the travis execution
Fixes #694
  • Loading branch information
Leo Arias committed May 31, 2018
commit 0f1286e2097b616b3ffea3223b374c3fbb04e0db
24 changes: 13 additions & 11 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,24 +4,26 @@ group: beta
language: node_js
node_js:
- "8"

cache:
directories:
- node_modules
env:
-
- SOLIDITY_COVERAGE=true
- SOLC_NIGHTLY=true
matrix:

jobs:
fast_finish: true
allow_failures:
- env: SOLIDITY_COVERAGE=true
- env: SOLC_NIGHTLY=true
before_script:
- truffle version
script:
- npm run lint
- npm run lint:sol
- npm run test
include:
- stage: static
script: npm run lint
- stage: unit
script: npm run test
- script: npm run test
env: SOLIDITY_COVERAGE=true
- script: npm run test
env: SOLC_NIGHTLY=true

notifications:
slack:
rooms:
Expand Down
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@
],
"scripts": {
"test": "scripts/test.sh",
"lint": "eslint .",
"lint:fix": "eslint . --fix",
"lint:js": "eslint .",
"lint:js:fix": "eslint . --fix",
"lint:sol": "solium -d .",
"lint:sol:fix": "solium -d . --fix",
"lint:all": "npm run lint && npm run lint:sol",
"lint:all:fix": "npm run lint:fix && npm run lint:sol:fix",
"lint": "npm run lint:js && npm run lint:sol",
"lint:fix": "npm run lint:js:fix && npm run lint:sol:fix",
"console": "truffle console",
"coverage": "scripts/coverage.sh",
"version": "scripts/version.js"
Expand Down
2 changes: 2 additions & 0 deletions scripts/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,8 @@ if [ "$SOLC_NIGHTLY" = true ]; then
wget -q https://raw.githubusercontent.com/ethereum/solc-bin/gh-pages/bin/soljson-nightly.js -O /tmp/soljson.js && find . -name soljson.js -exec cp /tmp/soljson.js {} \;
fi

truffle version

if [ "$SOLIDITY_COVERAGE" = true ]; then
node_modules/.bin/solidity-coverage

Expand Down