Skip to content
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

Jump to bottom

Don't run coveralls when pushing #379

Merged
merged 3 commits into from
Dec 1, 2017
Merged

Don't run coveralls when pushing #379

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
06979a1
Don't run coveralls on local
slipo Dec 1, 2017
4f7d50f
Cleaner solution for: Don't run coveralls on local
slipo Dec 1, 2017
588422f
Use new test-ci command for ci
slipo Dec 1, 2017
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
2 changes: 1 addition & 1 deletion .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
key: neon-wallet-{{ checksum "yarn.lock" }}
- run: sudo apt-get -y update
- run: sudo apt-get -y install libusb-1.0-0-dev
- run: yarn test
- run: yarn test-ci
- run:
name: Running Xvfb for e2e test
command: Xvfb -ac :99 -screen 0 1280x1024x16
Expand Down
3 changes: 2 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@
"dev": "cross-env PORT=3000 START_HOT=1 NODE_ENV=development node_modules/.bin/webpack-dev-server --config ./config/webpack.config.dev",
"start-dev": "cross-env PORT=3000 NODE_ENV=development electron . --enable-logging --remote-debugging-port=9222",
"assets-dev": "cross-env PORT=3000 NODE_ENV=development webpack --config ./config/webpack.config.dev",
"test": "npm rebuild node-hid && jest --coverage && cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js",
"test": "npm rebuild node-hid && jest --coverage",
"test-ci": "yarn test && cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js",
"test:e2e": "ava __e2e__/*.e2e.js --timeout=120s",
"test-watch": "jest --watch",
"pack": "build --dir",
Expand Down