Skip to content

Commit f2559a5

Browse files
committed
Merge branch 'v2' of github.com:expressjs/session into buffer
2 parents 947ce9a + 3e84825 commit f2559a5

File tree

7 files changed

+15
-38
lines changed

7 files changed

+15
-38
lines changed

.github/workflows/ci.yml

+7-8
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ jobs:
185185
run: |
186186
if npm -ps ls nyc | grep -q nyc; then
187187
npm run test-ci
188-
cp coverage/lcov.info "coverage/${{ matrix.name }}.lcov"
188+
cp coverage/lcov.info "coverage/${{ matrix.node-version }}.lcov"
189189
else
190190
npm test
191191
fi
@@ -198,17 +198,17 @@ jobs:
198198
if: steps.list_env.outputs.nyc != ''
199199
run: |
200200
if [[ -d ./coverage ]]; then
201-
mv ./coverage "./${{ matrix.name }}"
201+
mv ./coverage "./${{ matrix.node-version }}"
202202
mkdir ./coverage
203-
mv "./${{ matrix.name }}" "./coverage/${{ matrix.name }}"
203+
mv "./${{ matrix.node-version }}" "./coverage/${{ matrix.node-version }}"
204204
fi
205205
206206
- name: Upload code coverage
207-
uses: actions/upload-artifact@v3
207+
uses: actions/upload-artifact@v4
208208
if: steps.list_env.outputs.nyc != ''
209209
with:
210-
name: coverage
211-
path: ./coverage
210+
name: coverage-${{ matrix.node-version }}
211+
path: "./coverage/${{ matrix.node-version }}"
212212
retention-days: 1
213213

214214
coverage:
@@ -222,9 +222,8 @@ jobs:
222222
run: sudo apt-get -y install lcov
223223

224224
- name: Collect coverage reports
225-
uses: actions/download-artifact@v3
225+
uses: actions/download-artifact@v4
226226
with:
227-
name: coverage
228227
path: ./coverage
229228

230229
- name: Merge coverage reports

.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,5 @@ coverage
33
node_modules
44
npm-debug.log
55
package-lock.json
6+
/test/fixtures/server.crt
7+
/test/fixtures/server.key

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
},
3939
"scripts": {
4040
"lint": "eslint . && node ./scripts/lint-readme.js",
41-
"test": "mocha --require test/support/env --check-leaks --bail --no-exit --reporter spec test/",
41+
"test": "./test/support/gencert.sh && mocha --require test/support/env --check-leaks --bail --no-exit --reporter spec test/",
4242
"test-ci": "nyc --reporter=lcov --reporter=text npm test",
4343
"test-cov": "nyc npm test",
4444
"version": "node scripts/version-history.js && git add HISTORY.md"

test/fixtures/.gitkeep

Whitespace-only changes.

test/fixtures/server.crt

-14
This file was deleted.

test/fixtures/server.key

-15
This file was deleted.

test/support/gencert.sh

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
#! /bin/sh
2+
set -ex
3+
4+
openssl req -x509 -nodes -newkey rsa:2048 -keyout ./test/fixtures/server.key -out ./test/fixtures/server.crt -days 3650 \
5+
-subj "/C=US/ST=Illinois/L=Chicago/O=node-express-session/CN=express-session.local"

0 commit comments

Comments
 (0)