Skip to content

Commit

Permalink
Merge pull request #516 from zeromq/update-build [skip ci]
Browse files Browse the repository at this point in the history
Closes #515
Closes #490
Closes #495
Closes #479
Closes #475
Closes #473
  • Loading branch information
aminya authored Nov 13, 2022
2 parents fcfd2bc + 3cf8a36 commit 390c39c
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 26 deletions.
27 changes: 10 additions & 17 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,25 +15,25 @@ jobs:
fail-fast: false
matrix:
os:
- ubuntu-20.04
- macos-latest
- windows-latest
- ubuntu-22.04
- macos-11
- windows-2022
node_version:
- 14
- 18
node_arch:
- x64
include:
- os: windows-latest
node_version: 14
- os: windows-2022
node_version: 18
node_arch: x86
# - os: macos-11.0
# node_version: 15
# - os: macos-11
# node_version: 18
# node_arch: arm64
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Install Node
uses: actions/setup-node@v2
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node_version }}
architecture: ${{ matrix.node_arch }}
Expand All @@ -53,10 +53,3 @@ jobs:
uses: actions/upload-artifact@v2
with:
path: ./prebuilds

Skip:
if: contains(github.event.head_commit.message, '[skip ci]')
runs-on: ubuntu-latest
steps:
- name: Skip CI 🚫
run: echo skip ci
1 change: 1 addition & 0 deletions binding.gyp
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
'variables': {
'zmq_external%': 'false',
'openssl_fips': '',
},
'targets': [
{
Expand Down
18 changes: 9 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,26 +9,26 @@
"url": "https://github.com/zeromq/zeromq.js.git"
},
"dependencies": {
"nan": "2.14.2",
"node-gyp-build": "^4.2.3"
"nan": "2.17.0",
"node-gyp-build": "^4.5.0"
},
"devDependencies": {
"electron-mocha": "^6.0.0",
"jsdoc": "^3.5.4",
"mocha": "^5.0.0",
"nyc": "^12.0.2",
"prebuildify": "^4.1.2",
"semver": "^5.4.1",
"should": "^13.0.0"
"jsdoc": "^4.0.0",
"nyc": "^15.1.0",
"prebuildify": "^5.0.1",
"semver": "^7.3.8",
"should": "^13.2.3"
},
"engines": {
"node": ">=6.0"
},
"scripts": {
"install": "node-gyp-build || npm run build:libzmq",
"build:libzmq": "node-gyp rebuild",
"prebuildify": "prebuildify -t 15.7.0 -t 14.16.1 -t 12.4.0 -t [email protected] -t [email protected].12 -t electron@7.3.3 -t [email protected] -t [email protected] -t [email protected] -t [email protected] --strip",
"prebuildify-ia32": "prebuildify --arch=ia32 -t 15.7.0 -t 14.16.1 -t 12.4.0 -t [email protected] -t [email protected].12 -t electron@7.3.3 -t [email protected] -t [email protected] -t [email protected] -t [email protected] --strip",
"prebuildify": "prebuildify -t 18.12.1 -t 16.18.1 -t 14.21.1 -t 12.22.12 -t electron@11.5.0 --strip",
"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",
"build:docs": "jsdoc -R README.md -d docs lib/*.js",
"test": "mocha --expose-gc --slow 300",
"test:electron": "electron-mocha --slow 300",
Expand Down

0 comments on commit 390c39c

Please sign in to comment.