Skip to content

tests: use stages for the travis execution #967

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
frangio merged 15 commits into from
Aug 17, 2018
Merged

tests: use stages for the travis execution #967

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
0f1286e
tests: use stages for the travis execution
May 31, 2018
b46e610
add comments as suggested by @nventuro
May 31, 2018
825c5aa
move the unit tests first, as suggested by @frangio
May 31, 2018
5354379
make stages clearer as suggested by @nventuro
May 31, 2018
bc4a09c
Merge branch 'master' into bug/694/travis-stages
Jun 8, 2018
62b6b4d
tests: use stages for the travis execution
May 31, 2018
49005b8
add comments as suggested by @nventuro
May 31, 2018
91b16b2
move the unit tests first, as suggested by @frangio
May 31, 2018
046eb0c
make stages clearer as suggested by @nventuro
May 31, 2018
114a16c
update the stage names as suggested by @frangio
Jun 12, 2018
8b47d98
update the stage names as suggested by @frangio
Jun 12, 2018
545668e
Merge branch 'master' into bug/694/travis-stages
Aug 15, 2018
43aea24
Merge branch 'master' into bug/694/travis-stages
Aug 17, 2018
e194ac2
Run all tests in parallel
Aug 17, 2018
2354495
added names
Aug 17, 2018
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
24 changes: 13 additions & 11 deletions .travis.yml
View file
Open in desktop
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
Copy link
Contributor

@nventuro nventuro May 31, 2018

Choose a reason for hiding this comment

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

I'd add a short comment explaining we're running 3 jobs in the unit stage, since Travis' syntax for this is so obscure.

Copy link
Author

@come-maiz come-maiz May 31, 2018

Choose a reason for hiding this comment

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

Thanks for the review @nventuro!
I've added comments, please take another look.


notifications:
slack:
rooms:
Expand Down
8 changes: 4 additions & 4 deletions package.json
View file
Open in desktop
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 .",
Copy link
Contributor

@frangio frangio Jun 10, 2018

Choose a reason for hiding this comment

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

Yay! This was in my mind too.

Copy link
Contributor

@frangio frangio Jun 10, 2018

Choose a reason for hiding this comment

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

If we put this PR on hold we should still do this now.

"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
View file
Open in desktop
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