Skip to content

Commit 4d832b2

Browse files
committed
Merge remote-tracking branch 'origin/develop' into release/12.x
2 parents b53109b + b0f789f commit 4d832b2

File tree

3 files changed

+89
-63
lines changed

3 files changed

+89
-63
lines changed

.github/workflows/codeql-analysis.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929

3030
# Initializes the CodeQL tools for scanning.
3131
- name: Initialize CodeQL
32-
uses: github/codeql-action/init@v2
32+
uses: github/codeql-action/init@v3
3333
with:
3434
languages: ${{ matrix.language }}
3535
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -40,7 +40,7 @@ jobs:
4040
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
4141
# If this step fails, then you should remove it and run the build manually (see below)
4242
- name: Autobuild
43-
uses: github/codeql-action/autobuild@v2
43+
uses: github/codeql-action/autobuild@v3
4444

4545
# ℹ️ Command-line programs to run using the OS shell.
4646
# 📚 https://git.io/JvXDl
@@ -54,4 +54,4 @@ jobs:
5454
# make release
5555

5656
- name: Perform CodeQL Analysis
57-
uses: github/codeql-action/analyze@v2
57+
uses: github/codeql-action/analyze@v3

Readme.md

+3-2
Original file line numberDiff line numberDiff line change
@@ -1098,8 +1098,9 @@ program.error('Custom processing has failed', { exitCode: 2, code: 'my.custom.er
10981098
By default, Commander calls `process.exit` when it detects errors, or after displaying the help or version. You can override
10991099
this behaviour and optionally supply a callback. The default override throws a `CommanderError`.
11001100

1101-
The override callback is passed a `CommanderError` with properties `exitCode` number, `code` string, and `message`. The default override behaviour is to throw the error, except for async handling of executable subcommand completion which carries on. The normal display of error messages or version or help
1102-
is not affected by the override which is called after the display.
1101+
The override callback is passed a `CommanderError` with properties `exitCode` number, `code` string, and `message`.
1102+
Commander expects the callback to terminate the normal program flow, and will call `process.exit` if the callback returns.
1103+
The normal display of error messages or version or help is not affected by the override which is called after the display.
11031104

11041105
```js
11051106
program.exitOverride();

package-lock.json

+83-58
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)