Skip to content

Commit 390c39c

Browse files
authored
Merge pull request #516 from zeromq/update-build [skip ci]
Closes #515 Closes #490 Closes #495 Closes #479 Closes #475 Closes #473
2 parents fcfd2bc + 3cf8a36 commit 390c39c

File tree

3 files changed

+20
-26
lines changed

3 files changed

+20
-26
lines changed

.github/workflows/CI.yml

Lines changed: 10 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -15,25 +15,25 @@ jobs:
1515
fail-fast: false
1616
matrix:
1717
os:
18-
- ubuntu-20.04
19-
- macos-latest
20-
- windows-latest
18+
- ubuntu-22.04
19+
- macos-11
20+
- windows-2022
2121
node_version:
22-
- 14
22+
- 18
2323
node_arch:
2424
- x64
2525
include:
26-
- os: windows-latest
27-
node_version: 14
26+
- os: windows-2022
27+
node_version: 18
2828
node_arch: x86
29-
# - os: macos-11.0
30-
# node_version: 15
29+
# - os: macos-11
30+
# node_version: 18
3131
# node_arch: arm64
3232
steps:
33-
- uses: actions/checkout@v2
33+
- uses: actions/checkout@v3
3434

3535
- name: Install Node
36-
uses: actions/setup-node@v2
36+
uses: actions/setup-node@v3
3737
with:
3838
node-version: ${{ matrix.node_version }}
3939
architecture: ${{ matrix.node_arch }}
@@ -53,10 +53,3 @@ jobs:
5353
uses: actions/upload-artifact@v2
5454
with:
5555
path: ./prebuilds
56-
57-
Skip:
58-
if: contains(github.event.head_commit.message, '[skip ci]')
59-
runs-on: ubuntu-latest
60-
steps:
61-
- name: Skip CI 🚫
62-
run: echo skip ci

binding.gyp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
'variables': {
33
'zmq_external%': 'false',
4+
'openssl_fips': '',
45
},
56
'targets': [
67
{

package.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,26 +9,26 @@
99
"url": "https://github.com/zeromq/zeromq.js.git"
1010
},
1111
"dependencies": {
12-
"nan": "2.14.2",
13-
"node-gyp-build": "^4.2.3"
12+
"nan": "2.17.0",
13+
"node-gyp-build": "^4.5.0"
1414
},
1515
"devDependencies": {
1616
"electron-mocha": "^6.0.0",
17-
"jsdoc": "^3.5.4",
1817
"mocha": "^5.0.0",
19-
"nyc": "^12.0.2",
20-
"prebuildify": "^4.1.2",
21-
"semver": "^5.4.1",
22-
"should": "^13.0.0"
18+
"jsdoc": "^4.0.0",
19+
"nyc": "^15.1.0",
20+
"prebuildify": "^5.0.1",
21+
"semver": "^7.3.8",
22+
"should": "^13.2.3"
2323
},
2424
"engines": {
2525
"node": ">=6.0"
2626
},
2727
"scripts": {
2828
"install": "node-gyp-build || npm run build:libzmq",
2929
"build:libzmq": "node-gyp rebuild",
30-
"prebuildify": "prebuildify -t 15.7.0 -t 14.16.1 -t 12.4.0 -t electron@5.0.13 -t electron@6.1.12 -t electron@7.3.3 -t electron@8.5.5 -t electron@9.4.4 -t electron@10.4.3 -t electron@11.4.3 --strip",
31-
"prebuildify-ia32": "prebuildify --arch=ia32 -t 15.7.0 -t 14.16.1 -t 12.4.0 -t electron@5.0.13 -t electron@6.1.12 -t electron@7.3.3 -t electron@8.5.5 -t electron@9.4.4 -t electron@10.4.3 -t electron@11.4.3 --strip",
30+
"prebuildify": "prebuildify -t 18.12.1 -t 16.18.1 -t 14.21.1 -t 12.22.12 -t electron@11.5.0 --strip",
31+
"prebuildify-ia32": "prebuildify --arch=ia32 -t 18.12.1 -t 16.18.1 -t 14.21.1 -t 12.22.12 -t electron@11.5.0 --strip",
3232
"build:docs": "jsdoc -R README.md -d docs lib/*.js",
3333
"test": "mocha --expose-gc --slow 300",
3434
"test:electron": "electron-mocha --slow 300",

0 commit comments

Comments
 (0)