Skip to content

Commit

Permalink
Merge pull request #615 from zeromq/deps
Browse files Browse the repository at this point in the history
fix: update dependencies with minor changes
  • Loading branch information
aminya authored Jun 14, 2024
2 parents eaf6c45 + 8fd6653 commit 44656de
Show file tree
Hide file tree
Showing 26 changed files with 6,136 additions and 3,884 deletions.
10 changes: 5 additions & 5 deletions .clang-format
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ BreakBeforeBraces: Attach
BreakBeforeTernaryOperators: true
BreakConstructorInitializersBeforeComma: false
ColumnLimit: 90
CommentPragmas: '^ IWYU pragma:'
CommentPragmas: "^ IWYU pragma:"
ConstructorInitializerAllOnOneLineOrOnePerLine: false
ConstructorInitializerIndentWidth: 4
ContinuationIndentWidth: 4
Expand All @@ -32,13 +32,13 @@ DerivePointerAlignment: false
DisableFormat: false
ExperimentalAutoDetectBinPacking: false
FixNamespaceComments: false
ForEachMacros: [ foreach, Q_FOREACH, BOOST_FOREACH ]
ForEachMacros: [foreach, Q_FOREACH, BOOST_FOREACH]
IndentCaseLabels: false
IndentWidth: 4
IndentWrappedFunctionNames: false
KeepEmptyLinesAtTheStartOfBlocks: false
MacroBlockBegin: ''
MacroBlockEnd: ''
MacroBlockBegin: ""
MacroBlockEnd: ""
MaxEmptyLinesToKeep: 1
NamespaceIndentation: None
ObjCBlockIndentWidth: 2
Expand All @@ -64,5 +64,5 @@ SpacesInSquareBrackets: false
Standard: Auto
TabWidth: 4
UseTab: Never
...
---

14 changes: 3 additions & 11 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -1,16 +1,8 @@
{
"plugins": [
"prettier"
],
"extends": [
"plugin:prettier/recommended",
"eslint-config-atomic"
],
"plugins": ["prettier"],
"extends": ["plugin:prettier/recommended", "eslint-config-atomic"],
"rules": {
"@typescript-eslint/quotes": [
"error",
"double"
],
"@typescript-eslint/quotes": ["error", "double"],
"require-await": "off"
},
"ignorePatterns": [
Expand Down
22 changes: 11 additions & 11 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
---
name: Bug report
about: Create a report to help us improve
title: ''
title: ""
labels: bug
assignees: ''

assignees: ""
---

**Describe the bug**
A clear and concise description of what the bug is.
**Describe the bug** A clear and concise description of what the bug is.

**Reproducing**
If possible, provide a list of commands or a code sample that reproduces the bug that you are observing. Otherwise please describe as much as possible in which circumstances the bug can be observed.
**Reproducing** If possible, provide a list of commands or a code sample that
reproduces the bug that you are observing. Otherwise please describe as much as
possible in which circumstances the bug can be observed.

**Expected behavior**
A clear and concise description of what you expected to happen.
**Expected behavior** A clear and concise description of what you expected to
happen.

**Tested on**
- OS: [e.g. Ubuntu 18.04, Windows 10]
- ZeroMQ.js version: [e.g. 5.1.0, 6.0.0-beta.2]

- OS: [e.g. Ubuntu 18.04, Windows 10]
- ZeroMQ.js version: [e.g. 5.1.0, 6.0.0-beta.2]
21 changes: 10 additions & 11 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -1,20 +1,19 @@
---
name: Feature request
about: Suggest an idea for this project
title: ''
title: ""
labels: enhancement
assignees: ''

assignees: ""
---

**Is your feature request related to a problem? Please describe.**
A clear and concise description of what the problem is.
**Is your feature request related to a problem? Please describe.** A clear and
concise description of what the problem is.

**Describe the solution you'd like**
A clear and concise description of what you want to happen.
**Describe the solution you'd like** A clear and concise description of what you
want to happen.

**Describe alternatives you've considered**
A clear and concise description of any alternative solutions or features you've considered.
**Describe alternatives you've considered** A clear and concise description of
any alternative solutions or features you've considered.

**Additional context**
Add any other context or screenshots about the feature request here.
**Additional context** Add any other context or screenshots about the feature
request here.
44 changes: 25 additions & 19 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:

jobs:
Build:
if: "!contains(github.event.head_commit.message, '[skip ci]')"
if: ${{ !contains(github.event.head_commit.message, '[skip ci]') }}
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
Expand All @@ -17,7 +17,7 @@ jobs:
- ubuntu-20.04
- windows-2022
node_version:
- 20
- 18
node_arch:
- x64
cpp_arch:
Expand All @@ -33,38 +33,40 @@ jobs:

include:
- os: windows-2022
node_version: 20
node_version: 18
node_arch: x86
ARCH: x86
cpp_arch: amd64_x86
zmq_draft: false

# - os: windows-2022
# node_version: 20
# node_version: 18
# node_arch: x64
# ARCH: arm64
# cpp_arch: amd64_arm64
# zmq_draft: false

- os: macos-13
node_version: 20
node_version: 18
node_arch: x64
ARCH: x86_64
cpp_arch: x64
zmq_draft: false

- os: macos-13
node_version: 20
node_version: 18
node_arch: x64
ARCH: arm64
cpp_arch: amd64_arm64
zmq_draft: false

# Alpine
- os: ubuntu-22.04
docker: node:20-alpine
docker_cmd: apk add --no-cache pkgconfig curl tar python3 make gcc g++ cmake musl-dev && npm i -g pnpm && pnpm install && pnpm run prebuild
node_version: 20
docker: node:18-alpine
docker_cmd:
apk add --no-cache pkgconfig curl tar python3 make gcc g++ cmake
musl-dev && npm i -g pnpm && pnpm install && pnpm run prebuild
node_version: 18
node_arch: x64
ARCH: x64
cpp_arch: x64
Expand All @@ -75,15 +77,18 @@ jobs:
ZMQ_SHARED: false
ARCH: ${{ matrix.ARCH }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Cache
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
./node_modules/
./build/
key: "cache-OS:${{ matrix.os }}-arch:${{ matrix.node_arch }}-ZMQ_DRAFT:${{ matrix.zmq_draft }}-Node:${{ matrix.node_version }}-${{ hashFiles('./package.json') }}"
key:
"cache-OS:${{ matrix.os }}-arch:${{ matrix.node_arch
}}-ZMQ_DRAFT:${{ matrix.zmq_draft }}-Node:${{ matrix.node_version
}}-${{ hashFiles('./package.json') }}"
restore-keys: |
"cache-OS:${{ matrix.os }}-arch:${{ matrix.node_arch }}-ZMQ_DRAFT:${{ matrix.zmq_draft }}-Node:${{ matrix.node_version }}-"
Expand All @@ -96,14 +101,14 @@ jobs:
python: true
architecture: ${{ matrix.cpp_arch }}

- uses: pnpm/action-setup@v2.2.4
- uses: pnpm/action-setup@v4
if: ${{ !matrix.docker }}
with:
version: 8
version: 9

- name: Install Node
if: ${{ !matrix.docker }}
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node_version }}
architecture: ${{ matrix.node_arch }}
Expand Down Expand Up @@ -149,18 +154,19 @@ jobs:

- name: Test (Debug)
if: ${{ !matrix.docker }}
uses: nick-fields/retry@v2
uses: nick-fields/retry@v3
with:
timeout_minutes: 5
max_attempts: 1
command: |
pnpm run clean
pnpm run test.skip_gc_tests
continue-on-error: "${{ contains(matrix.os, 'ubuntu') && !matrix.docker }}"
continue-on-error:
"${{ contains(matrix.os, 'ubuntu') && !matrix.docker }}"

- name: Test Electron (Main)
if: "${{ contains(matrix.os, 'ubuntu') && !matrix.docker }}"
uses: nick-fields/retry@v2
uses: nick-fields/retry@v3
with:
timeout_minutes: 5
max_attempts: 1
Expand All @@ -173,7 +179,7 @@ jobs:

- name: Tests + GC Tests (Release)
if: ${{ !matrix.docker }}
uses: nick-fields/retry@v2
uses: nick-fields/retry@v3
with:
timeout_minutes: 5
max_attempts: 1
Expand Down
9 changes: 7 additions & 2 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@ on:

jobs:
Docs:
if: "startsWith(github.ref, 'refs/tags/') && !contains(github.event.head_commit.message, '[skip ci]')"
if:
"startsWith(github.ref, 'refs/tags/') &&
!contains(github.event.head_commit.message, '[skip ci]')"
runs-on: ubuntu-22.04
strategy:
fail-fast: false
Expand Down Expand Up @@ -37,7 +39,10 @@ jobs:
path: |
./node_modules/
./build/
key: "cache-OS:${{ matrix.os }}-arch:${{ matrix.node_arch }}-ZMQ_DRAFT:${{ matrix.zmq_draft }}-Node:${{ matrix.node_version }}-${{ hashFiles('./package.json') }}"
key:
"cache-OS:${{ matrix.os }}-arch:${{ matrix.node_arch
}}-ZMQ_DRAFT:${{ matrix.zmq_draft }}-Node:${{ matrix.node_version
}}-${{ hashFiles('./package.json') }}"
restore-keys: |
"cache-OS:${{ matrix.os }}-arch:${{ matrix.node_arch }}-ZMQ_DRAFT:${{ matrix.zmq_draft }}-Node:${{ matrix.node_version }}-"
Expand Down
6 changes: 3 additions & 3 deletions .mocharc.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
'use strict'
"use strict"

module.exports = {
require: ['ts-node/register', 'rocha'],
spec: ['test/unit/*-test.ts', 'test/unit/compat/*-test.{ts,js}'],
require: ["ts-node/register", "rocha"],
spec: ["test/unit/*-test.ts", "test/unit/compat/*-test.{ts,js}"],
"expose-gc": true,
"experimental-worker": true,
recursive: true,
Expand Down
6 changes: 6 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
/docs/
/docs-raw
/lib
/prebuilds
/node_modules
pnpm-lock.yaml
Loading

0 comments on commit 44656de

Please sign in to comment.