Skip to content
This repository was archived by the owner on May 14, 2024. It is now read-only.

Commit caab2c2

Browse files
committed
Update dependencies and CI (#796)
* Update dependencies * Run CI for "next" releases * Grrr * Update target versions * Fix test on Node 17 * Fix deprecation notice
1 parent 8dce600 commit caab2c2

File tree

6 files changed

+30
-16
lines changed

6 files changed

+30
-16
lines changed

.github/workflows/integration.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,14 @@ name: 'Integration Tests'
44
# https://github.community/t5/GitHub-Actions/Github-Actions-services-not-reachable/m-p/30739/highlight/true#M538
55

66
on:
7+
push:
8+
branches:
9+
- master
10+
- next
711
pull_request:
812
branches:
913
- master
14+
- next
1015

1116
jobs:
1217
baseline:

.github/workflows/main.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,11 @@ on:
44
push:
55
branches:
66
- master
7+
- next
78
pull_request:
89
branches:
910
- master
11+
- next
1012

1113
jobs:
1214
lint:
@@ -15,6 +17,8 @@ jobs:
1517
steps:
1618
- uses: actions/checkout@v3
1719
- uses: actions/setup-node@v3
20+
with:
21+
node-version: 'lts/*'
1822
- name: Install Packages
1923
run: npm install
2024
- name: Lint Code
@@ -28,10 +32,9 @@ jobs:
2832
- ubuntu-latest
2933
- windows-latest
3034
node:
31-
- 10.13.0
32-
- 10.x
33-
- 12.x
34-
- 14.x
35+
- 14
36+
- 16
37+
- 17
3538
runs-on: ${{ matrix.os }}
3639
steps:
3740
- uses: actions/checkout@v3

.npmrc

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# npm general settings
2+
package-lock=false
3+
legacy-peer-deps=true
4+
5+
# pnpm specific settings
6+
hoist=false
7+
public-hoist-pattern[]=*eslint*

package.json

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,17 +27,17 @@
2727
"verror": "^1.8.1"
2828
},
2929
"devDependencies": {
30-
"eslint": "^7.20.0",
30+
"@fastify/pre-commit": "^2.0.2",
31+
"eslint": "8.12.0",
3132
"eslint-config-standard": "^16.0.2",
3233
"eslint-plugin-import": "^2.22.1",
3334
"eslint-plugin-node": "^11.1.0",
34-
"eslint-plugin-promise": "^5.1.0",
35+
"eslint-plugin-promise": "6.0.0",
3536
"front-matter": "^4.0.2",
3637
"get-port": "^5.1.1",
3738
"highlight.js": "^11.0.1",
38-
"husky": "^4.2.5",
3939
"marked": "^4.0.0",
40-
"tap": "15.2.3"
40+
"tap": "16.0.1"
4141
},
4242
"scripts": {
4343
"test": "tap --no-cov -R terse",
@@ -51,9 +51,8 @@
5151
"lint:ci": "eslint .",
5252
"docs": "node scripts/build-docs.js"
5353
},
54-
"husky": {
55-
"hooks": {
56-
"pre-commit": "npm run lint:ci && npm run test"
57-
}
58-
}
54+
"pre-commit": [
55+
"lint:ci",
56+
"test"
57+
]
5958
}

test/laundry.test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ tap.test('GH-55 Client emits connect multiple times', function (t) {
122122
t.ok(socket)
123123
count++
124124
c.bind('cn=root', 'secret', function (err) {
125-
t.ifError(err)
125+
t.error(err)
126126
c.unbind(function () {
127127
t.equal(count, 1)
128128
t.end()

test/server.test.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ tap.test('properties', function (t) {
5555

5656
t.equal(server.url, null, 'url empty before bind')
5757
// listen on a random port so we have a url
58-
server.listen(0, 'localhost', function () {
58+
server.listen(0, '127.0.0.1', function () {
5959
t.ok(server.url)
6060

6161
server.close(() => t.end())
@@ -94,7 +94,7 @@ tap.test('listen on static port', function (t) {
9494

9595
tap.test('listen on ephemeral port', function (t) {
9696
const server = ldap.createServer()
97-
server.listen(0, 'localhost', function () {
97+
server.listen(0, '127.0.0.1', function () {
9898
const addr = server.address()
9999
t.ok(addr.port > 0)
100100
t.ok(addr.port < 65535)

0 commit comments

Comments
 (0)