Skip to content

Commit

Permalink
Merge branch 'master' into 5-merge
Browse files Browse the repository at this point in the history
  • Loading branch information
@ctcpip
ctcpip committed Aug 2, 2024
2 parents dde1f7d + 2177f67 commit ea49706
Show file tree
Hide file tree
Showing 4 changed files with 122 additions and 143 deletions.
256 changes: 115 additions & 141 deletions .github/workflows/ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,163 +20,137 @@ concurrency:
cancel-in-progress: true

jobs:
test:
lint:
name: Lint
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Setup Node.js {{ matrix.node-version }}
uses: actions/setup-node@v4
with:
node-version: 'lts/*'
persist-credentials: false

- name: Install dependencies
run: npm install --ignore-scripts --only=dev

- name: Run lint
run: npm run lint

test:
name: Run tests
strategy:
fail-fast: false
matrix:
name:
- Node.js 4.0
- Node.js 4.x
- Node.js 5.x
- Node.js 6.x
- Node.js 7.x
- Node.js 8.x
- Node.js 9.x
- Node.js 10.x
- Node.js 11.x
- Node.js 12.x
- Node.js 13.x
- Node.js 14.x
- Node.js 15.x
- Node.js 16.x
- Node.js 17.x
- Node.js 18.x
- Node.js 19.x
- Node.js 20.x
- Node.js 21.x
- Node.js 22.x

os: [ubuntu-latest, windows-latest]
node-version:
- "4"
- "5"
- "6"
- "7"
- "8"
- "9"
- "10"
- "11"
- "12"
- "13"
- "14"
- "15"
- "16"
- "17"
- "18"
- "19"
- "20"
- "21"
- "22"
# Use supported versions of our testing tools under older versions of Node
# Install npm in some specific cases where we need to
include:
- name: Node.js 4.x
node-version: "4"
npm-i: [email protected] [email protected] [email protected]

- name: Node.js 5.x
node-version: "5"
npm-i: [email protected] [email protected] [email protected]

- name: Node.js 6.x
node-version: "6"
npm-i: [email protected] [email protected] [email protected]

- name: Node.js 7.x
node-version: "7"
npm-i: [email protected] [email protected] [email protected]

- name: Node.js 8.x
node-version: "8"
npm-i: [email protected] [email protected]

- name: Node.js 9.x
node-version: "9"
npm-i: [email protected] [email protected]

- name: Node.js 10.x
node-version: "10"
npm-i: [email protected]

- name: Node.js 11.x
node-version: "11"
npm-i: [email protected]
- node-version: "4"
npm-i: "[email protected] [email protected] [email protected]"

- name: Node.js 12.x
node-version: "12"
npm-i: [email protected]
- node-version: "5"
npm-i: "[email protected] [email protected] [email protected]"
# fixes https://github.com/npm/cli/issues/681
npm-version: "[email protected]"

- name: Node.js 13.x
node-version: "13"
npm-i: [email protected]
- node-version: "6"
npm-i: "[email protected] [email protected] [email protected]"

- name: Node.js 14.x
node-version: "14"
- node-version: "7"
npm-i: "[email protected] [email protected] [email protected]"

- name: Node.js 15.x
node-version: "15"
- node-version: "8"
npm-i: "[email protected] [email protected]"

- name: Node.js 16.x
node-version: "16"
- node-version: "9"
npm-i: "[email protected] [email protected]"

- name: Node.js 17.x
node-version: "17"
- node-version: "10"
npm-i: "[email protected]"

- name: Node.js 18.x
node-version: "18"
- node-version: "11"
npm-i: "[email protected]"

- name: Node.js 19.x
node-version: "19"
- node-version: "12"
npm-i: "[email protected]"

- name: Node.js 20.x
node-version: "20"

- name: Node.js 21.x
node-version: "21"

- name: Node.js 22.x
node-version: "22"
- node-version: "13"
npm-i: "[email protected]"

runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v4

- name: Install Node.js ${{ matrix.node-version }}
shell: bash -eo pipefail -l {0}
run: |
nvm install --default ${{ matrix.node-version }}
dirname "$(nvm which ${{ matrix.node-version }})" >> "$GITHUB_PATH"
- name: Install npm module(s) ${{ matrix.npm-i }}
run: npm install --save-dev ${{ matrix.npm-i }}
if: matrix.npm-i != ''

- name: Remove non-test dependencies
run: npm rm --silent --save-dev connect-redis

- name: Setup Node.js version-specific dependencies
shell: bash
run: |
# eslint for linting
# - remove on Node.js < 12
if [[ "$(cut -d. -f1 <<< "${{ matrix.node-version }}")" -lt 12 ]]; then
node -pe 'Object.keys(require("./package").devDependencies).join("\n")' | \
grep -E '^eslint(-|$)' | \
sort -r | \
xargs -n1 npm rm --silent --save-dev
fi
- name: Install Node.js dependencies
run: npm install

- name: List environment
id: list_env
shell: bash
run: |
echo "node@$(node -v)"
echo "npm@$(npm -v)"
npm -s ls ||:
(npm -s ls --depth=0 ||:) | awk -F'[ @]' 'NR>1 && $2 { print $2 "=" $3 }' >> "$GITHUB_OUTPUT"
- name: Run tests
shell: bash
run: |
npm run test-ci
cp coverage/lcov.info "coverage/${{ matrix.name }}.lcov"
- name: Lint code
if: steps.list_env.outputs.eslint != ''
run: npm run lint

- name: Collect code coverage
run: |
mv ./coverage "./${{ matrix.name }}"
mkdir ./coverage
mv "./${{ matrix.name }}" "./coverage/${{ matrix.name }}"
- name: Upload code coverage
uses: actions/upload-artifact@v3
with:
name: coverage
path: ./coverage
retention-days: 1
- uses: actions/checkout@v4
with:
persist-credentials: false

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

- name: Npm version fixes
if: ${{matrix.npm-version != ''}}
run: npm install -g ${{ matrix.npm-version }}

- name: Configure npm loglevel
run: |
npm config set loglevel error
shell: bash

- name: Install dependencies
run: npm install

- name: Install Node version specific dev deps
if: ${{ matrix.npm-i != '' }}
run: npm install --save-dev ${{ matrix.npm-i }}

- name: Remove non-test dependencies
run: npm rm --silent --save-dev connect-redis

- name: Output Node and NPM versions
run: |
echo "Node.js version: $(node -v)"
echo "NPM version: $(npm -v)"
- name: Run tests
shell: bash
run: |
npm run test-ci
cp coverage/lcov.info "coverage/${{ matrix.node-version }}.lcov"
- name: Collect code coverage
run: |
mv ./coverage "./${{ matrix.node-version }}"
mkdir ./coverage
mv "./${{ matrix.node-version }}" "./coverage/${{ matrix.node-version }}"
- name: Upload code coverage
uses: actions/upload-artifact@v3
with:
name: coverage
path: ./coverage
retention-days: 1

coverage:
needs: test
Expand Down
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# npm
node_modules
package-lock.json
npm-shrinkwrap.json
*.log
*.gz

Expand Down
4 changes: 4 additions & 0 deletions Readme.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@
[![NPM Version][npm-version-image]][npm-url]
[![NPM Install Size][npm-install-size-image]][npm-install-size-url]
[![NPM Downloads][npm-downloads-image]][npm-downloads-url]
[![OpenSSF Scorecard Badge][ossf-scorecard-badge]][ossf-scorecard-visualizer]


```js
const express = require('express')
Expand Down Expand Up @@ -252,4 +254,6 @@ The original author of Express is [TJ Holowaychuk](https://github.com/tj)
[npm-install-size-url]: https://packagephobia.com/result?p=express
[npm-url]: https://npmjs.org/package/express
[npm-version-image]: https://badgen.net/npm/v/express
[ossf-scorecard-badge]: https://api.securityscorecards.dev/projects/github.com/expressjs/express/badge
[ossf-scorecard-visualizer]: https://kooltheba.github.io/openssf-scorecard-api-visualizer/#/projects/github.com/expressjs/express
[Code of Conduct]: https://github.com/expressjs/express/blob/master/Code-Of-Conduct.md
4 changes: 2 additions & 2 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,8 @@
"scripts": {
"lint": "eslint .",
"test": "mocha --require test/support/env --reporter spec --bail --check-leaks test/ test/acceptance/",
"test-ci": "nyc --reporter=lcovonly --reporter=text npm test",
"test-cov": "nyc --reporter=html --reporter=text npm test",
"test-ci": "nyc --exclude examples --exclude test --exclude benchmarks --reporter=lcovonly --reporter=text npm test",
"test-cov": "nyc --exclude examples --exclude test --exclude benchmarks --reporter=html --reporter=text npm test",
"test-tap": "mocha --require test/support/env --reporter tap --check-leaks test/ test/acceptance/"
}
}

0 comments on commit ea49706

Please sign in to comment.