Skip to content

Commit 055f5c5

Browse files
gkorlandgkorland
authored
Merge branch 'master' into patch-1
2 parents 0ad516f + c78b6d5 commit 055f5c5

File tree

100 files changed

+2445
-2156
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

100 files changed

+2445
-2156
lines changed

‎.eslintrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@ rules:
102102
globals:
103103
it: true
104104
describe: true
105+
xdescribe: true
105106
before: true
106107
after: true
107108
beforeEach: true

‎.github/FUNDING.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
open_collective: node-redis

‎.github/ISSUE_TEMPLATE.md

Lines changed: 29 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,34 @@
1-
_Thanks for wanting to report an issue you've found in node_redis. Please delete
1+
---
2+
title: ⚠️ Bug report
3+
labels: needs-triage
4+
---
5+
6+
### Issue
7+
8+
<!--
9+
Thanks for wanting to report an issue you've found in node_redis. Please delete
210
this text and fill in the template below. Please note that the issue tracker is only
3-
for bug reports or feature requests. If you have a question, please ask that on [gitter].
4-
If unsure about something, just do as best as you're able._
11+
for bug reports or feature requests.
12+
13+
If you have a question, please ask it on Stack Overflow using the `node-redis` tag.
514
6-
_Note that it will be much easier to fix the issue if a test case that reproduces
15+
Note that it will be much easier to fix the issue if a test case that reproduces
716
the problem is provided. It is of course not always possible to reduce your code
8-
to a small test case, but it's highly appreciated to have as much data as possible.
9-
Thank you!_
17+
with a small test case, but it's highly appreciated to have as much data as possible.
18+
-->
19+
20+
> Describe your issue here
21+
22+
23+
---
1024

11-
* **Version**: What node_redis and what redis version is the issue happening on?
12-
* **Platform**: What platform / version? (For example Node.js 0.10 or Node.js 5.7.0 on Windows 7 / Ubuntu 15.10 / Azure)
13-
* **Description**: Description of your issue, stack traces from errors and code that reproduces the issue
25+
### Environment
1426

15-
[gitter]: https://gitter.im/NodeRedis/node_redis?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge
27+
<!-- e.g. "node --version" -->
28+
- **Node.js Version**: `VERSION_HERE`
29+
30+
<!-- e.g. "redis-server --version" -->
31+
- **Redis Version**: `VERSION_HERE`
32+
33+
<!-- e.g. Windows 10, Mac OSX 10.15.2 -->
34+
- **Platform**: `PLATFORM_HERE`

‎.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,23 @@
1-
### Pull Request check-list
1+
<!-- please ensure you have read the `./CONTRIBUTING.md` guide -->
22

3-
_Please make sure to review and check all of these items:_
3+
### Description
4+
5+
<!-- Please provide a description of the change below, e.g What was the purpose? -->
6+
<!-- Why does it matter to you? What problem are you trying to solve? -->
7+
<!-- Tag in any linked issues. -->
8+
9+
> Description your pull request here
10+
11+
12+
---
13+
14+
### Checklist
15+
16+
<!-- Please make sure to review and check all of these items: -->
417

518
- [ ] Does `npm test` pass with this change (including linting)?
619
- [ ] Is the new or changed code fully tested?
720
- [ ] Is a documentation update included (if this change modifies existing APIs, or introduces new ones)?
821

9-
_NOTE: these things are not required to open a PR and can be done
10-
afterwards / while the PR is open._
11-
12-
### Description of change
13-
14-
_Please provide a description of the change here._
22+
<!-- NOTE: these things are not required to open a PR and can be done
23+
afterwards / while the PR is open. -->

‎.github/workflows/benchmark.yml

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
name: Benchmarking
2+
3+
on: [pull_request]
4+
5+
jobs:
6+
benchmark:
7+
name: Benchmark
8+
runs-on: ubuntu-latest
9+
strategy:
10+
fail-fast: false
11+
matrix:
12+
node-version: [8.x, 10.x, 12.x]
13+
redis-version: [5]
14+
15+
steps:
16+
- uses: actions/checkout@v1
17+
with:
18+
fetch-depth: 1
19+
20+
- name: Use Node.js ${{ matrix.node-version }}
21+
uses: actions/setup-node@v1
22+
with:
23+
node-version: ${{ matrix.node-version }}
24+
25+
- name: Setup Redis
26+
uses: shogo82148/[email protected]
27+
with:
28+
redis-version: ${{ matrix.redis-version }}
29+
auto-start: "true"
30+
31+
- run: npm i --no-audit --prefer-offline
32+
- name: Run Benchmark
33+
run: npm run benchmark > benchmark-output.txt && cat benchmark-output.txt
34+
- name: Upload Benchmark Result
35+
uses: actions/upload-artifact@v1
36+
with:
37+
name: benchmark-output.txt
38+
path: benchmark-output.txt

‎.github/workflows/linting.yml

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
name: Linting
2+
3+
on: [pull_request]
4+
5+
jobs:
6+
eslint:
7+
name: ESLint
8+
runs-on: ubuntu-latest
9+
steps:
10+
- uses: actions/checkout@v1
11+
with:
12+
fetch-depth: 1
13+
- uses: actions/setup-node@v1
14+
with:
15+
node-version: 12
16+
- run: npm i --no-audit --prefer-offline
17+
- name: Test Code Linting
18+
run: npm run lint
19+
- name: Save Code Linting Report JSON
20+
run: npm run lint:report
21+
continue-on-error: true
22+
- name: Annotate Code Linting Results
23+
uses: ataylorme/[email protected]
24+
with:
25+
repo-token: "${{ secrets.GITHUB_TOKEN }}"
26+
report-json: "eslint-report.json"
27+
- name: Upload ESLint report
28+
uses: actions/upload-artifact@v1
29+
with:
30+
name: eslint-report.json
31+
path: eslint-report.json

‎.github/workflows/tests.yml

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
name: Tests
2+
3+
on: [push]
4+
5+
jobs:
6+
testing:
7+
name: Test
8+
runs-on: ubuntu-latest
9+
strategy:
10+
fail-fast: false
11+
matrix:
12+
node-version: [6.x, 8.x, 10.x, 12.x]
13+
redis-version: [4.x, 5.x]
14+
15+
steps:
16+
- uses: actions/checkout@v1
17+
with:
18+
fetch-depth: 1
19+
20+
- name: Use Node.js ${{ matrix.node-version }}
21+
uses: actions/setup-node@v1
22+
with:
23+
node-version: ${{ matrix.node-version }}
24+
25+
- name: Setup Redis
26+
uses: shogo82148/[email protected]
27+
with:
28+
redis-version: ${{ matrix.redis-version }}
29+
auto-start: "false"
30+
31+
- name: Disable IPv6
32+
run: sudo sh -c 'echo 0 > /proc/sys/net/ipv6/conf/all/disable_ipv6';
33+
34+
- name: Setup Stunnel
35+
run: sudo apt-get install stunnel4
36+
37+
- name: Install Packages
38+
run: npm i --no-audit --prefer-offline
39+
40+
- name: Run Tests
41+
run: npm test
42+
43+
- name: Submit Coverage
44+
run: npm run coveralls
45+
env:
46+
COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_TOKEN }}
47+
48+
- name: Upload Coverage Report
49+
uses: actions/upload-artifact@v1
50+
with:
51+
name: coverage
52+
path: coverage

‎.github/workflows/tests_windows.yml

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
name: Tests Windows
2+
3+
on: [push]
4+
5+
jobs:
6+
testing-windows:
7+
name: Test Windows
8+
runs-on: windows-latest
9+
strategy:
10+
fail-fast: false
11+
matrix:
12+
node-version: [6.x, 8.x, 10.x, 12.x]
13+
steps:
14+
- uses: actions/checkout@v1
15+
with:
16+
fetch-depth: 1
17+
18+
- name: Install Redis
19+
uses: crazy-max/ghaction-chocolatey@v1
20+
with:
21+
args: install redis-64 --no-progress
22+
23+
- name: Start Redis
24+
run: |
25+
redis-server --service-install
26+
redis-server --service-start
27+
redis-cli config set stop-writes-on-bgsave-error no
28+
29+
- name: Setup Node.js ${{ matrix.node-version }}
30+
uses: actions/setup-node@v1
31+
with:
32+
node-version: ${{ matrix.node-version }}
33+
34+
- name: Install Packages
35+
run: npm i --no-audit --prefer-offline
36+
37+
- name: Run Tests
38+
run: npm test
39+
40+
- name: Submit Coverage
41+
run: npm run coveralls
42+
env:
43+
COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_TOKEN }}
44+
45+
- name: Upload Coverage Report
46+
uses: actions/upload-artifact@v1
47+
with:
48+
name: coverage
49+
path: coverage

‎.gitignore

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,11 @@ coverage
77
stunnel.conf
88
stunnel.pid
99
*.out
10+
package-lock.json
11+
12+
# IntelliJ IDEs
13+
.idea
14+
# VisualStudioCode IDEs
15+
.vscode
16+
.vs
17+
eslint-report.json

‎.npmignore

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,20 @@ benchmarks/
33
test/
44
.nyc_output/
55
coverage/
6+
.github/
7+
.eslintignore
8+
.eslintrc
69
.tern-port
710
*.log
811
*.rdb
912
*.out
1013
*.yml
14+
.vscode
15+
.idea
16+
CONTRIBUTING.md
17+
CODE_OF_CONDUCT.md
18+
.travis.yml
19+
appveyor.yml
20+
package-lock.json
21+
.prettierrc
22+
eslint-report.json

0 commit comments

Comments
 (0)