Skip to content

Commit 11c1503

Browse files
authored
Merge branch 'master' into auth_pwd_user
2 parents fe0ef9e + 2a34d41 commit 11c1503

File tree

6 files changed

+31
-25
lines changed

6 files changed

+31
-25
lines changed

.github/workflows/benchmark.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,17 @@ jobs:
1313
redis-version: [5]
1414

1515
steps:
16-
- uses: actions/checkout@v1
16+
- uses: actions/checkout@v2.3.4
1717
with:
1818
fetch-depth: 1
1919

2020
- name: Use Node.js ${{ matrix.node-version }}
21-
uses: actions/setup-node@v1
21+
uses: actions/setup-node@v2.1.5
2222
with:
2323
node-version: ${{ matrix.node-version }}
2424

2525
- name: Setup Redis
26-
uses: shogo82148/actions-setup-redis@v1.0.1
26+
uses: shogo82148/actions-setup-redis@v1.9.7
2727
with:
2828
redis-version: ${{ matrix.redis-version }}
2929
auto-start: "true"
@@ -32,7 +32,7 @@ jobs:
3232
- name: Run Benchmark
3333
run: npm run benchmark > benchmark-output.txt && cat benchmark-output.txt
3434
- name: Upload Benchmark Result
35-
uses: actions/upload-artifact@v1
35+
uses: actions/upload-artifact@v2.2.2
3636
with:
3737
name: benchmark-output.txt
3838
path: benchmark-output.txt

.github/workflows/linting.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ jobs:
77
name: ESLint
88
runs-on: ubuntu-latest
99
steps:
10-
- uses: actions/checkout@v1
10+
- uses: actions/checkout@v2.3.4
1111
with:
1212
fetch-depth: 1
13-
- uses: actions/setup-node@v1
13+
- uses: actions/setup-node@v2.1.5
1414
with:
1515
node-version: 12
1616
- run: npm i --no-audit --prefer-offline
@@ -20,12 +20,12 @@ jobs:
2020
run: npm run lint:report
2121
continue-on-error: true
2222
- name: Annotate Code Linting Results
23-
uses: ataylorme/eslint-annotate-action@1.0.4
23+
uses: ataylorme/eslint-annotate-action@1.1.2
2424
with:
2525
repo-token: "${{ secrets.GITHUB_TOKEN }}"
2626
report-json: "eslint-report.json"
2727
- name: Upload ESLint report
28-
uses: actions/upload-artifact@v1
28+
uses: actions/upload-artifact@v2.2.2
2929
with:
3030
name: eslint-report.json
3131
path: eslint-report.json

.github/workflows/tests.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,17 @@ jobs:
1313
redis-version: [4.x, 5.x]
1414

1515
steps:
16-
- uses: actions/checkout@v1
16+
- uses: actions/checkout@v2.3.4
1717
with:
1818
fetch-depth: 1
1919

2020
- name: Use Node.js ${{ matrix.node-version }}
21-
uses: actions/setup-node@v1
21+
uses: actions/setup-node@v2.1.5
2222
with:
2323
node-version: ${{ matrix.node-version }}
2424

2525
- name: Setup Redis
26-
uses: shogo82148/actions-setup-redis@v1.0.1
26+
uses: shogo82148/actions-setup-redis@v1.9.7
2727
with:
2828
redis-version: ${{ matrix.redis-version }}
2929
auto-start: "false"
@@ -46,7 +46,7 @@ jobs:
4646
COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_TOKEN }}
4747

4848
- name: Upload Coverage Report
49-
uses: actions/upload-artifact@v1
49+
uses: actions/upload-artifact@v2.2.2
5050
with:
5151
name: coverage
5252
path: coverage

.github/workflows/tests_windows.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@ jobs:
1111
matrix:
1212
node-version: [6.x, 8.x, 10.x, 12.x]
1313
steps:
14-
- uses: actions/checkout@v1
14+
- uses: actions/checkout@v2.3.4
1515
with:
1616
fetch-depth: 1
1717

1818
- name: Install Redis
19-
uses: crazy-max/ghaction-chocolatey@v1
19+
uses: crazy-max/ghaction-chocolatey@v1.4.0
2020
with:
21-
args: install redis-64 --no-progress
21+
args: install redis-64 --version=3.0.503 --no-progress
2222

2323
- name: Start Redis
2424
run: |
@@ -27,7 +27,7 @@ jobs:
2727
redis-cli config set stop-writes-on-bgsave-error no
2828
2929
- name: Setup Node.js ${{ matrix.node-version }}
30-
uses: actions/setup-node@v1
30+
uses: actions/setup-node@v2.1.5
3131
with:
3232
node-version: ${{ matrix.node-version }}
3333

@@ -43,7 +43,7 @@ jobs:
4343
COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_TOKEN }}
4444

4545
- name: Upload Coverage Report
46-
uses: actions/upload-artifact@v1
46+
uses: actions/upload-artifact@v2.2.2
4747
with:
4848
name: coverage
4949
path: coverage

CONTRIBUTING.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,9 +82,13 @@ Working on your first Pull Request? You can learn how from this _free_ series,
8282

8383
Node Redis has a full test suite with coverage setup.
8484

85-
To run the tests use the `npm test` command. To check detailed coverage locally run the `npm run coverage` command after
85+
To run the tests, run `npm install` to install all dependencies, and then run `npm test`. To check detailed coverage locally run the `npm run coverage` command after
8686
testing and open the generated `./coverage/index.html` in your browser.
8787

88+
Note that the test suite assumes that a few tools are installed in your environment, such as:
89+
- redis (make sure redis-server is not running when starting the tests, it's part of the test-suite to start it and you'll end up with a "port already in use" error)
90+
- stunnel (for TLS tests)
91+
8892
### Submitting code for review
8993

9094
The bigger the pull request, the longer it will take to review and merge. Where possible try to break down large pull

0 commit comments

Comments
 (0)