Skip to content

Commit

Permalink
Merge remote-tracking branch 'KhaosT/beta' into random-setup-codes
Browse files Browse the repository at this point in the history
# Conflicts:
#	src/lib/Accessory.ts
#	src/lib/Advertiser.ts
#	src/lib/HAPServer.ts
#	src/lib/util/eventedhttp.ts
  • Loading branch information
samuelthomas2774 committed Nov 2, 2020
2 parents d2a1fbc + 977d5ad commit 5e06e26
Show file tree
Hide file tree
Showing 74 changed files with 16,004 additions and 11,555 deletions.
2 changes: 1 addition & 1 deletion .github/stale.yml
@@ -1,7 +1,7 @@
# Configuration for probot-stale - https://github.com/probot/stale

# Number of days of inactivity before an Issue or Pull Request becomes stale
daysUntilStale: 60
daysUntilStale: 23
# Number of days of inactivity before a stale Issue or Pull Request is closed
daysUntilClose: 7
# Issues or Pull Requests with these labels will never be considered stale. Set to `[]` to disable
Expand Down
20 changes: 19 additions & 1 deletion .github/workflows/nodejs.yml
Expand Up @@ -26,9 +26,27 @@ jobs:
run: |
npm ci
npm run build --if-present
npm test
npm test-coverage
env:
CI: true
- name: Coveralls Parallel
uses: coverallsapp/github-action@master
with:
github-token: ${{ secrets.github_token }}
flag-name: run-${{ matrix.node-version }}
parallel: true

finish:
needs: build

runs-on: ubuntu-latest

steps:
- name: Coveralls Finished
uses: coverallsapp/github-action@master
with:
github-token: ${{ secrets.github_token }}
parallel-finished: true

publish-npm:
# publish only if we are on our own repo, event was 'create' (a tag was created) and the tag starts with "v" (aka version tag)
Expand Down
13 changes: 10 additions & 3 deletions jest.config.js
@@ -1,4 +1,11 @@
module.exports = {
preset: 'ts-jest',
testEnvironment: 'node',
};
preset: "ts-jest",
testEnvironment: "node",
coverageReporters: ["lcov"],
collectCoverageFrom: [
"src/**",
"!src/accessories/**",
"!src/lib/definitions/generate-definitions.ts",
"!src/lib/definitions/generator-configuration.ts"
],
};

0 comments on commit 5e06e26

Please sign in to comment.