Skip to content

Commit 7cfde07

Browse files
authoredJul 11, 2018
fix: re-enable lint step in CircleCI (#252)
1 parent 4909878 commit 7cfde07

File tree

5 files changed

+2233
-2214
lines changed

5 files changed

+2233
-2214
lines changed
 

‎.circleci/config.yml

+18-12
Original file line numberDiff line numberDiff line change
@@ -12,22 +12,22 @@ workflows:
1212
- node10:
1313
filters: *all_commits
1414
- docs:
15-
requires:
16-
- node6
17-
- node8
18-
- node10
15+
filters: *all_commits
16+
- lint:
1917
filters: *all_commits
2018
- system_tests:
21-
requires:
22-
- docs
2319
filters:
2420
branches:
2521
only: master
2622
tags: &releases
2723
only: '/^v[\d.]+$/'
2824
- publish_npm:
2925
requires:
26+
- node6
27+
- node8
28+
- node10
3029
- system_tests
30+
- docs
3131
filters:
3232
branches:
3333
ignore: /.*/
@@ -65,8 +65,8 @@ jobs:
6565
npm install
6666
environment:
6767
NPM_CONFIG_PREFIX: /home/node/.npm-global
68-
- run: npm test
69-
- run: node_modules/.bin/codecov
68+
- run: npm run test-only
69+
- run: npm run codecov
7070
node8:
7171
docker:
7272
- image: 'node:8'
@@ -77,6 +77,14 @@ jobs:
7777
- image: 'node:10'
7878
user: node
7979
steps: *unit_tests_steps
80+
lint:
81+
docker:
82+
- image: 'node:10'
83+
user: node
84+
steps:
85+
- checkout
86+
- run: *npm_install_and_link
87+
- run: npm run check
8088
docs:
8189
docker:
8290
- image: 'node:10'
@@ -85,9 +93,7 @@ jobs:
8593
- checkout
8694
- run: *remove_package_lock
8795
- run: *npm_install_and_link
88-
- run:
89-
name: Build documentation.
90-
command: npm run docs
96+
- run: npm run docs
9197
system_tests:
9298
docker:
9399
- image: 'node:10'
@@ -120,5 +126,5 @@ jobs:
120126
user: node
121127
steps:
122128
- checkout
123-
- run: 'echo "//registry.npmjs.org/:_authToken=${NPM_TOKEN}" > ~/.npmrc'
129+
- run: echo "//registry.npmjs.org/:_authToken=${NPM_TOKEN}" > ~/.npmrc
124130
- run: npm publish

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,4 @@ out/
77
system-test/secrets.js
88
system-test/*key.json
99
*.lock
10+
build/

‎package-lock.json

+2,200-2,193
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

+10-9
Original file line numberDiff line numberDiff line change
@@ -36,20 +36,19 @@
3636
"greenkeeper[bot] <greenkeeper[bot]@users.noreply.github.com>"
3737
],
3838
"scripts": {
39-
"cover": "nyc --reporter=lcov mocha --require intelli-espower-loader build/test/*.js && nyc report",
39+
"codecov": "nyc report --reporter=json && codecov -f .coverage/*.json",
4040
"docs": "jsdoc -c .jsdoc.js",
4141
"generate-scaffolding": "repo-tools generate all",
42-
"publish-module": "node ../../scripts/publish.js firestore",
43-
"system-test": "mocha build/system-test/*.js --timeout 600000",
44-
"conformance": "mocha build/conformance/*.js --timeout 2000",
45-
"test-no-cover": "mocha build/test/*.js --timeout 2000",
46-
"test": "npm run cover",
42+
"system-test": "mocha build/system-test --timeout 600000",
43+
"conformance": "mocha build/conformance",
44+
"test-only": "nyc mocha build/test",
45+
"test": "npm run test-only",
4746
"check": "gts check",
4847
"clean": "gts clean",
4948
"compile": "tsc -p . && cp -r protos build/protos && cp -r test/fake-certificate.json build/test/fake-certificate.json && cp src/v1beta1/firestore_client_config.json build/src/v1beta1/ && cp conformance/test-definition.proto build/conformance && cp conformance/test-suite.binproto build/conformance",
5049
"fix": "gts fix",
5150
"prepare": "npm run compile",
52-
"pretest": "npm run compile",
51+
"pretest-only": "npm run compile",
5352
"posttest": "npm run check"
5453
},
5554
"dependencies": {
@@ -70,6 +69,8 @@
7069
"@types/node": "^10.3.5",
7170
"codecov": "^3.0.2",
7271
"duplexify": "^3.6.0",
72+
"gts": "^0.7.1",
73+
"hard-rejection": "^1.0.0",
7374
"ink-docstrap": "git+https://github.com/docstrap/docstrap.git",
7475
"intelli-espower-loader": "^1.0.1",
7576
"jsdoc": "^3.5.5",
@@ -78,7 +79,7 @@
7879
"power-assert": "^1.6.0",
7980
"protobufjs": "^6.8.6",
8081
"proxyquire": "^2.0.1",
81-
"typescript": "^2.9.2",
82-
"gts": "^0.7.1"
82+
"source-map-support": "^0.5.6",
83+
"typescript": "^2.9.2"
8384
}
8485
}

‎test/mocha.opts

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
--require hard-rejection/register
2+
--require source-map-support/register
3+
--require intelli-espower-loader
4+
--timeout 2000

0 commit comments

Comments
 (0)
Please sign in to comment.