Skip to content

Commit

Permalink
Merge branch 'master' into feature/husky
Browse files Browse the repository at this point in the history
  • Loading branch information
victorperin committed Oct 12, 2019
2 parents 4bf920b + 1aa93ca commit d082a57
Show file tree
Hide file tree
Showing 5 changed files with 47 additions and 1 deletion.
3 changes: 3 additions & 0 deletions .npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,6 @@ bin
.prettierrc
tests/
*.test.js
.travis.yml
demo.gif
jest.config.js
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ install:
- npm run build

script:
- xvfb-run npm test
- xvfb-run npm run test:coverage

jobs:
include:
Expand Down
40 changes: 40 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
"scripts": {
"start": "node ./src/cli/index.js",
"test": "jest",
"test:coverage": "jest --coverage && cat ./coverage/lcov.info | coveralls",
"pretest": "eslint .",
"test:diff": "jest --no-cache --passWithNoTests --collectCoverage=false --findRelatedTests",
"build": "pkg . -t node10-linux-x64,node10-macos-x64,node10-win-x64 --out-path ./bin",
Expand All @@ -30,6 +31,7 @@
"devDependencies": {
"@commitlint/cli": "^8.2.0",
"@commitlint/config-angular": "^8.2.0",
"coveralls": "^3.0.7",
"eslint": "^6.5.1",
"eslint-config-airbnb-base": "^14.0.0",
"eslint-config-prettier": "^6.4.0",
Expand Down
1 change: 1 addition & 0 deletions readme.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# QR Scanner CLI

[![Build Status](https://travis-ci.org/victorperin/qr-scanner-cli.svg?branch=master)](https://travis-ci.org/victorperin/qr-scanner-cli)
[![Coverage Status](https://coveralls.io/repos/github/victorperin/qr-scanner-cli/badge.svg?branch=master)](https://coveralls.io/github/victorperin/qr-scanner-cli?branch=master)
[![Greenkeeper badge](https://badges.greenkeeper.io/victorperin/qr-scanner-cli.svg)](https://greenkeeper.io/)

QR Scanner CLI is a project that can resolve any QR code from an image on your desktop.
Expand Down

0 comments on commit d082a57

Please sign in to comment.