Skip to content

Commit

Permalink
Merge branch 'trevnorris/v22-nsolid-patch' into node-v22.x-nsolid-v5.x
Browse files Browse the repository at this point in the history
PR-URL: #184
  • Loading branch information
trevnorris committed Sep 26, 2024
2 parents 4631be0 + 4b06e43 commit 462b669
Show file tree
Hide file tree
Showing 8,685 changed files with 1,819,519 additions and 1,693 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
34 changes: 18 additions & 16 deletions .github/SUPPORT.md
Original file line number Diff line number Diff line change
@@ -1,26 +1,28 @@
# Support

Node.js contributors have limited availability to address general support
questions. Please make sure you are using a [currently-supported version of
Node.js](https://github.com/nodejs/Release#release-schedule).
N|Solid contributors have limited availability to address general support
questions. Please make sure you are using a currently supported version of
N|Solid, which follows the same schedule from [Node.js](https://github.com/nodejs/Release#release-schedule).

When looking for support, please first search for your question in these venues:

* [Node.js Website](https://nodejs.org/en/), especially the
[API docs](https://nodejs.org/api/)
* [Node.js Help](https://github.com/nodejs/help)
* [Open or closed issues in the Node.js GitHub organization](https://github.com/issues?utf8=%E2%9C%93&q=sort%3Aupdated-desc+org%3Anodejs+is%3Aissue)

If you didn't find an answer in the resources above, try these unofficial
resources:

* [Questions tagged 'node.js' on Stack Overflow](https://stackoverflow.com/questions/tagged/node.js)
* [#node.js channel on libera.chat](https://web.libera.chat?channels=node.js&uio=d4)
* [Node.js Slack Community](https://node-js.slack.com/)
* To register: [nodeslackers.com](https://www.nodeslackers.com/)
* [NodeSource Website](https://nodesource.com/), especially the
[Documentation site](https://docs.nodesource.com/)
* [Open or closed issues in the N|Solid GitHub repository](https://github.com/nodesource/nsolid/issues)
* [Questions tagged 'nsolid' on Stack Overflow](https://stackoverflow.com/questions/tagged/nsolid)

GitHub issues are for tracking enhancements and bugs, not general support.

The open source license grants you the freedom to use Node.js. It does not
The open-source license grants you the freedom to use N|Solid. It does not
guarantee commitments of other people's time. Please be respectful and manage
your expectations.

## Professional Support Offering

NodeSource offers professional support services for N|Solid, helping companies
establish and sustain enterprise-grade N|Solid applications and services. The
support extends from installation and configuration to upgrades, troubleshooting,
and performance tuning, empowering teams to build and manage highly performant
and reliable applications. Different levels of engagement are available to
augment your development and operation teams, keeping your project on track when
it matters most. For more details, visit [NodeSource Support](https://nodesource.com/services/support).
6 changes: 2 additions & 4 deletions .github/workflows/coverage-linux-without-intl.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ on:
- tools/gyp/**
- tools/test.py
- .github/workflows/coverage-linux-without-intl.yml
- agents/**
- codecov.yml
push:
branches:
Expand All @@ -25,6 +26,7 @@ on:
- tools/gyp/**
- tools/test.py
- .github/workflows/coverage-linux-without-intl.yml
- agents/**
- codecov.yml

concurrency:
Expand Down Expand Up @@ -67,10 +69,6 @@ jobs:
# The cause is most likely coverage's use of the inspector.
- name: Test
run: NODE_V8_COVERAGE=coverage/tmp make test-cov -j4 V=1 TEST_CI_ARGS="-p dots --node-args='--test-reporter=spec' --measure-flakiness 9" || exit 0
- name: Report JS
run: npx c8 report --check-coverage
env:
NODE_OPTIONS: --max-old-space-size=8192
- name: Report C++
run: gcovr --object-directory=out -v --filter src --xml -o ./coverage/coverage-cxx.xml --root=./ --gcov-executable="llvm-cov-18 gcov"
# Clean temporary output from gcov and c8, so that it's not uploaded:
Expand Down
6 changes: 2 additions & 4 deletions .github/workflows/coverage-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ on:
- tools/gyp/**
- tools/test.py
- .github/workflows/coverage-linux.yml
- agents/**
- codecov.yml
push:
branches:
Expand All @@ -25,6 +26,7 @@ on:
- tools/gyp/**
- tools/test.py
- .github/workflows/coverage-linux.yml
- agents/**
- codecov.yml

concurrency:
Expand Down Expand Up @@ -67,10 +69,6 @@ jobs:
# The cause is most likely coverage's use of the inspector.
- name: Test
run: NODE_V8_COVERAGE=coverage/tmp make test-cov -j4 V=1 TEST_CI_ARGS="-p dots --node-args='--test-reporter=spec' --measure-flakiness 9" || exit 0
- name: Report JS
run: npx c8 report --check-coverage
env:
NODE_OPTIONS: --max-old-space-size=8192
- name: Report C++
run: gcovr --object-directory=out -v --filter src --xml -o ./coverage/coverage-cxx.xml --root=./ --gcov-executable="llvm-cov-18 gcov"
# Clean temporary output from gcov and c8, so that it's not uploaded:
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/coverage-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ on:
- tools/gyp/**
- tools/test.py
- .github/workflows/coverage-windows.yml
- agents/**
- codecov.yml
push:
branches:
Expand All @@ -25,6 +26,7 @@ on:
- tools/gyp/**
- tools/test.py
- .github/workflows/coverage-windows.yml
- agents/**
- codecov.yml

concurrency:
Expand Down
65 changes: 0 additions & 65 deletions .github/workflows/linters.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,44 +51,6 @@ jobs:
run: npx envinfo
- name: Lint C/C++ files
run: make lint-cpp
format-cpp:
if: ${{ github.event.pull_request && github.event.pull_request.draft == false && github.base_ref == github.event.repository.default_branch }}
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
with:
fetch-depth: 0
persist-credentials: false
- name: Use Node.js ${{ env.NODE_VERSION }}
uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3
with:
node-version: ${{ env.NODE_VERSION }}
- name: Set up Python ${{ env.PYTHON_VERSION }}
uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 # v5.2.0
with:
python-version: ${{ env.PYTHON_VERSION }}
- name: Environment Information
run: npx envinfo
- name: Format C/C++ files
run: |
make format-cpp-build
# The `make format-cpp` error code is intentionally ignored here
# because it is irrelevant. We already check if the formatter produced
# a diff in the next line.
# Refs: https://github.com/nodejs/node/pull/42764
CLANG_FORMAT_START="$(git merge-base HEAD refs/remotes/origin/$GITHUB_BASE_REF)" \
make format-cpp || true
git --no-pager diff --exit-code && EXIT_CODE="$?" || EXIT_CODE="$?"
if [ "$EXIT_CODE" != "0" ]
then
echo
echo 'ERROR: Please run:'
echo
echo " CLANG_FORMAT_START="$\(git merge-base HEAD ${GITHUB_BASE_REF}\)" make format-cpp"
echo
echo 'to format the commits in your branch.'
exit "$EXIT_CODE"
fi
lint-js-and-md:
if: github.event.pull_request.draft == false
runs-on: ubuntu-latest
Expand Down Expand Up @@ -131,23 +93,6 @@ jobs:
run: |
make lint-py-build
make lint-py
lint-yaml:
if: github.event.pull_request.draft == false
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
with:
persist-credentials: false
- name: Use Python ${{ env.PYTHON_VERSION }}
uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 # v5.2.0
with:
python-version: ${{ env.PYTHON_VERSION }}
- name: Environment Information
run: npx envinfo
- name: Lint YAML
run: |
make lint-yaml-build || true
make lint-yaml
lint-sh:
if: github.event.pull_request.draft == false
Expand All @@ -159,16 +104,6 @@ jobs:
- run: shellcheck -V
- name: Lint Shell scripts
run: tools/lint-sh.mjs .
lint-codeowners:
if: github.event.pull_request.draft == false
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
with:
persist-credentials: false
- uses: mszostok/codeowners-validator@7f3f5e28c6d7b8dfae5731e54ce2272ca384592f
with:
checks: files,duppatterns
lint-pr-url:
if: ${{ github.event.pull_request }}
runs-on: ubuntu-latest
Expand Down
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -165,3 +165,9 @@ __pycache__

# === Rules for C++ development ===
compile_commands.json
# NSolid specifics
/nsolid
/nsolid_g
# Ignore asserts-cpp and nlohmann paths in src/
src/asserts-cpp/
src/nlohmann/
Loading

0 comments on commit 462b669

Please sign in to comment.