Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Changed supported OS and NodeJS version #47

Merged
merged 1 commit into from
Nov 21, 2024
Merged

Changed supported OS and NodeJS version #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ jobs:
fail-fast: false

matrix:
node-version: [18, 20]
node-version: [18, 20, 22]

steps:
#
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/nodejs_helper.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -736,7 +736,7 @@ PRNSUCCESS "Start to check options and environments"
CPPCHECK_TARGET="."
CPPCHECK_BASE_OPT="--quiet --error-exitcode=1 --inline-suppr -j 4 --std=c++03 --xml --enable=warning,style,information,missingInclude"
CPPCHECK_ENABLE_VALUES="warning style information missingInclude"
CPPCHECK_IGNORE_VALUES="unmatchedSuppression"
CPPCHECK_IGNORE_VALUES="unmatchedSuppression missingIncludeSystem normalCheckLevelMaxBranches"
CPPCHECK_BUILD_DIR="/tmp/cppcheck"

SHELLCHECK_TARGET_DIRS="."
Expand Down
17 changes: 6 additions & 11 deletions .github/workflows/nodejstypevars.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,25 +65,20 @@ if [ -z "${CI_NODEJS_MAJOR_VERSION}" ]; then
# Unknown NodeJS Major version : Nothing to do
#
:
elif [ "${CI_NODEJS_MAJOR_VERSION}" = "14" ]; then
INSTALL_PKG_LIST="git gcc g++ make chmpx-dev"
INSTALLER_BIN="apt-get"
INSTALL_QUIET_ARG="-qq"
IS_PUBLISHER=0

elif [ "${CI_NODEJS_MAJOR_VERSION}" = "16" ]; then
elif [ "${CI_NODEJS_MAJOR_VERSION}" = "18" ]; then
INSTALL_PKG_LIST="git gcc g++ make chmpx-dev"
INSTALLER_BIN="apt-get"
INSTALL_QUIET_ARG="-qq"
IS_PUBLISHER=0
IS_PUBLISHER=1

elif [ "${CI_NODEJS_MAJOR_VERSION}" = "18" ]; then
elif [ "${CI_NODEJS_MAJOR_VERSION}" = "20" ]; then
INSTALL_PKG_LIST="git gcc g++ make chmpx-dev"
INSTALLER_BIN="apt-get"
INSTALL_QUIET_ARG="-qq"
IS_PUBLISHER=1
IS_PUBLISHER=0

elif [ "${CI_NODEJS_MAJOR_VERSION}" = "20" ]; then
elif [ "${CI_NODEJS_MAJOR_VERSION}" = "22" ]; then
INSTALL_PKG_LIST="git gcc g++ make chmpx-dev"
INSTALLER_BIN="apt-get"
INSTALL_QUIET_ARG="-qq"
Expand Down Expand Up @@ -132,7 +127,7 @@ fi
# CPPCHECK_TARGET "."
# CPPCHECK_BASE_OPT "--quiet --error-exitcode=1 --inline-suppr -j 4 --std=c++03 --xml"
# CPPCHECK_ENABLE_VALUES "warning style information missingInclude"
# CPPCHECK_IGNORE_VALUES "unmatchedSuppression"
# CPPCHECK_IGNORE_VALUES "unmatchedSuppression missingIncludeSystem normalCheckLevelMaxBranches"
# CPPCHECK_BUILD_DIR "/tmp/cppcheck"
#
# SHELLCHECK_TARGET_DIRS "."
Expand Down
6 changes: 3 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
},
"dependencies": {
"bindings": "^1.5.0",
"nan": "^2.19.0"
"nan": "^2.22.0"
},
"devDependencies": {
"chai": "^4.4.1",
"mocha": "^10.2.0"
"chai": "^4.5.0",
"mocha": "^10.8.2"
},
"scripts": {
"build": "npm run build:before && npm run build:configure && npm run build:rebuild && npm run build:linkdir && npm run build:after",
Expand Down
2 changes: 1 addition & 1 deletion tests/run_process_helper.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ initialize_pid_file()
PROC_ZOMBIE=""
for _one_pid in ${PIDS}; do
# shellcheck disable=SC2009
if PSRESULT=$(ps -p "${_one_pid}" 2>&1 | grep -v 'PID'); then
if PSRESULT=$(ps -p "${_one_pid}" -F 2>&1 | grep -v 'PID'); then
if echo "${PSRESULT}" | grep "${_one_pid}" | grep -q 'defunct'; then
PROC_ZOMBIE="${PROC_ZOMBIE} ${_one_pid}"
else
Expand Down