Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'master' into patch-1
  • Loading branch information
gkorland committed Mar 4, 2021
2 parents 0ad516f + c78b6d5 commit 055f5c5
Show file tree
Hide file tree
Showing 100 changed files with 2,445 additions and 2,156 deletions.
1 change: 1 addition & 0 deletions .eslintrc
Expand Up @@ -102,6 +102,7 @@ rules:
globals:
it: true
describe: true
xdescribe: true
before: true
after: true
beforeEach: true
Expand Down
1 change: 1 addition & 0 deletions .github/FUNDING.yml
@@ -0,0 +1 @@
open_collective: node-redis
39 changes: 29 additions & 10 deletions .github/ISSUE_TEMPLATE.md
@@ -1,15 +1,34 @@
_Thanks for wanting to report an issue you've found in node_redis. Please delete
---
title: ⚠️ Bug report
labels: needs-triage
---

### Issue

<!--
Thanks for wanting to report an issue you've found in node_redis. Please delete
this text and fill in the template below. Please note that the issue tracker is only
for bug reports or feature requests. If you have a question, please ask that on [gitter].
If unsure about something, just do as best as you're able._
for bug reports or feature requests.
If you have a question, please ask it on Stack Overflow using the `node-redis` tag.
_Note that it will be much easier to fix the issue if a test case that reproduces
Note that it will be much easier to fix the issue if a test case that reproduces
the problem is provided. It is of course not always possible to reduce your code
to a small test case, but it's highly appreciated to have as much data as possible.
Thank you!_
with a small test case, but it's highly appreciated to have as much data as possible.
-->

> Describe your issue here

---

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

[gitter]: https://gitter.im/NodeRedis/node_redis?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge
<!-- e.g. "node --version" -->
- **Node.js Version**: `VERSION_HERE`

<!-- e.g. "redis-server --version" -->
- **Redis Version**: `VERSION_HERE`

<!-- e.g. Windows 10, Mac OSX 10.15.2 -->
- **Platform**: `PLATFORM_HERE`
25 changes: 17 additions & 8 deletions .github/PULL_REQUEST_TEMPLATE.md
@@ -1,14 +1,23 @@
### Pull Request check-list
<!-- please ensure you have read the `./CONTRIBUTING.md` guide -->

_Please make sure to review and check all of these items:_
### Description

<!-- Please provide a description of the change below, e.g What was the purpose? -->
<!-- Why does it matter to you? What problem are you trying to solve? -->
<!-- Tag in any linked issues. -->

> Description your pull request here

---

### Checklist

<!-- Please make sure to review and check all of these items: -->

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

_NOTE: these things are not required to open a PR and can be done
afterwards / while the PR is open._

### Description of change

_Please provide a description of the change here._
<!-- NOTE: these things are not required to open a PR and can be done
afterwards / while the PR is open. -->
38 changes: 38 additions & 0 deletions .github/workflows/benchmark.yml
@@ -0,0 +1,38 @@
name: Benchmarking

on: [pull_request]

jobs:
benchmark:
name: Benchmark
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
node-version: [8.x, 10.x, 12.x]
redis-version: [5]

steps:
- uses: actions/checkout@v1
with:
fetch-depth: 1

- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}

- name: Setup Redis
uses: shogo82148/actions-setup-redis@v1.0.1
with:
redis-version: ${{ matrix.redis-version }}
auto-start: "true"

- run: npm i --no-audit --prefer-offline
- name: Run Benchmark
run: npm run benchmark > benchmark-output.txt && cat benchmark-output.txt
- name: Upload Benchmark Result
uses: actions/upload-artifact@v1
with:
name: benchmark-output.txt
path: benchmark-output.txt
31 changes: 31 additions & 0 deletions .github/workflows/linting.yml
@@ -0,0 +1,31 @@
name: Linting

on: [pull_request]

jobs:
eslint:
name: ESLint
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
with:
fetch-depth: 1
- uses: actions/setup-node@v1
with:
node-version: 12
- run: npm i --no-audit --prefer-offline
- name: Test Code Linting
run: npm run lint
- name: Save Code Linting Report JSON
run: npm run lint:report
continue-on-error: true
- name: Annotate Code Linting Results
uses: ataylorme/eslint-annotate-action@1.0.4
with:
repo-token: "${{ secrets.GITHUB_TOKEN }}"
report-json: "eslint-report.json"
- name: Upload ESLint report
uses: actions/upload-artifact@v1
with:
name: eslint-report.json
path: eslint-report.json
52 changes: 52 additions & 0 deletions .github/workflows/tests.yml
@@ -0,0 +1,52 @@
name: Tests

on: [push]

jobs:
testing:
name: Test
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
node-version: [6.x, 8.x, 10.x, 12.x]
redis-version: [4.x, 5.x]

steps:
- uses: actions/checkout@v1
with:
fetch-depth: 1

- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}

- name: Setup Redis
uses: shogo82148/actions-setup-redis@v1.0.1
with:
redis-version: ${{ matrix.redis-version }}
auto-start: "false"

- name: Disable IPv6
run: sudo sh -c 'echo 0 > /proc/sys/net/ipv6/conf/all/disable_ipv6';

- name: Setup Stunnel
run: sudo apt-get install stunnel4

- name: Install Packages
run: npm i --no-audit --prefer-offline

- name: Run Tests
run: npm test

- name: Submit Coverage
run: npm run coveralls
env:
COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_TOKEN }}

- name: Upload Coverage Report
uses: actions/upload-artifact@v1
with:
name: coverage
path: coverage
49 changes: 49 additions & 0 deletions .github/workflows/tests_windows.yml
@@ -0,0 +1,49 @@
name: Tests Windows

on: [push]

jobs:
testing-windows:
name: Test Windows
runs-on: windows-latest
strategy:
fail-fast: false
matrix:
node-version: [6.x, 8.x, 10.x, 12.x]
steps:
- uses: actions/checkout@v1
with:
fetch-depth: 1

- name: Install Redis
uses: crazy-max/ghaction-chocolatey@v1
with:
args: install redis-64 --no-progress

- name: Start Redis
run: |
redis-server --service-install
redis-server --service-start
redis-cli config set stop-writes-on-bgsave-error no
- name: Setup Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}

- name: Install Packages
run: npm i --no-audit --prefer-offline

- name: Run Tests
run: npm test

- name: Submit Coverage
run: npm run coveralls
env:
COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_TOKEN }}

- name: Upload Coverage Report
uses: actions/upload-artifact@v1
with:
name: coverage
path: coverage
8 changes: 8 additions & 0 deletions .gitignore
Expand Up @@ -7,3 +7,11 @@ coverage
stunnel.conf
stunnel.pid
*.out
package-lock.json

# IntelliJ IDEs
.idea
# VisualStudioCode IDEs
.vscode
.vs
eslint-report.json
12 changes: 12 additions & 0 deletions .npmignore
Expand Up @@ -3,8 +3,20 @@ benchmarks/
test/
.nyc_output/
coverage/
.github/
.eslintignore
.eslintrc
.tern-port
*.log
*.rdb
*.out
*.yml
.vscode
.idea
CONTRIBUTING.md
CODE_OF_CONDUCT.md
.travis.yml
appveyor.yml
package-lock.json
.prettierrc
eslint-report.json
11 changes: 11 additions & 0 deletions .prettierrc
@@ -0,0 +1,11 @@
{
"arrowParens": "avoid",
"trailingComma": "all",
"useTabs": false,
"semi": true,
"singleQuote": false,
"bracketSpacing": true,
"jsxBracketSameLine": false,
"tabWidth": 2,
"printWidth": 100
}
17 changes: 0 additions & 17 deletions .travis.yml

This file was deleted.

0 comments on commit 055f5c5

Please sign in to comment.