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

Feature demo 1 #13

Open
wants to merge 16 commits into
base: master
Choose a base branch
from
Open

Feature demo 1 #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
a303291
use coveralls bin
nickmerwin Sep 3, 2020
e33cf31
Update Makefile
nickmerwin Sep 3, 2020
1148002
Update Makefile
nickmerwin Sep 3, 2020
e78508e
Update Makefile
nickmerwin Sep 3, 2020
a83345d
Update Makefile
nickmerwin Sep 3, 2020
9b53047
Circle use universal
nickmerwin Sep 3, 2020
bff080a
Update config.yml
nickmerwin Sep 3, 2020
7a7f926
parallel
nickmerwin Sep 9, 2020
9899d69
Update config.yml
nickmerwin Sep 9, 2020
28364c1
add untested
nickmerwin Sep 9, 2020
2c36b2f
Update run.js
nickmerwin Sep 9, 2020
79ada11
coveralls -d
nickmerwin Sep 9, 2020
5bcc012
Update config.yml
nickmerwin Sep 9, 2020
105cf88
added untested
nickmerwin Sep 9, 2020
f2d00e8
Update run.js
nickmerwin Sep 9, 2020
52ce354
Update run.js
nickmerwin Sep 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 3 additions & 11 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
version: 2.1

orbs:
coveralls: coveralls/[email protected]
node: circleci/[email protected]

jobs:
Expand All @@ -17,10 +16,7 @@ jobs:
- run: npm install
- run: make test-coverage-1

- coveralls/upload:
parallel: true
flag_name: Test 1
verbose: true
- run: wget -c -q https://coveralls.io/coveralls-linux.tar.gz -O - | tar -xz && ./coveralls --parallel -j "Test 1"

build-2:
executor:
Expand All @@ -34,18 +30,14 @@ jobs:
- run: npm install
- run: make test-coverage-2

- coveralls/upload:
parallel: true
flag_name: Test 2
verbose: true
- run: wget -c -q https://coveralls.io/coveralls-linux.tar.gz -O - | tar -xz && ./coveralls --parallel -j "Test 2"

done:
executor:
name: node/default

steps:
- coveralls/upload:
parallel_finished: true
- run: wget -c -q https://coveralls.io/coveralls-linux.tar.gz -O - | tar -xz && ./coveralls --done

workflows:
test_parallel_then_upload:
Expand Down
8 changes: 1 addition & 7 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,6 @@ sudo: false
language: node_js
node_js:
- "node"
env:
global:
- COVERALLS_PARALLEL=true
jobs:
include:
- script: COVERALLS_FLAG_NAME=test-1 make test-coveralls-1
- script: COVERALLS_FLAG_NAME=test-2 make test-coveralls-2
notifications:
webhooks: https://coveralls.io/webhook
- script: make test-coveralls
6 changes: 5 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ test:
lint:
./node_modules/.bin/jshint ./lib ./test ./index.js

test-coverage:
@NODE_ENV=test ./node_modules/.bin/istanbul cover \
./node_modules/mocha/bin/_mocha --report lcovonly -- -R spec

test-coverage-1:
@NODE_ENV=test ./node_modules/.bin/istanbul cover \
./node_modules/mocha/bin/_mocha --report lcovonly test/run1.js -- -R spec
Expand All @@ -17,7 +21,7 @@ test-coverage-2:
test-coveralls:
@NODE_ENV=test ./node_modules/.bin/istanbul cover \
./node_modules/mocha/bin/_mocha --report lcovonly -- -R spec && \
cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js --verbose
wget -c -q https://mer.s3.amazonaws.com/coveralls-linux.tar.gz -O - | tar -xz && ./coveralls

test-coveralls-1:
@NODE_ENV=test ./node_modules/.bin/istanbul cover \
Expand Down
38 changes: 19 additions & 19 deletions package-lock.json
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"test": "make test"
},
"devDependencies": {
"coveralls": "3.1.0",
"coveralls": "^3.1.0",
"istanbul": "0.4.5",
"jshint": "^2.11.0",
"mocha": "^7.1.1",
Expand Down