Skip to content

Commit 7c769d4

Browse files
ggtakecggtakec
authored
Merge pull request #60 from ggtakec/update/codes
Changed publish NodeJS versions to v22 and Fixed scripts, etc
2 parents 85ba5ea + 22d4828 commit 7c769d4

File tree

6 files changed

+62
-34
lines changed

6 files changed

+62
-34
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,10 @@ name: Node.js AntPickax CI
2828
#
2929
on:
3030
push:
31+
branches-ignore:
32+
- 'gh-pages'
33+
tags:
34+
- '*'
3135
pull_request:
3236
#
3337
# CRON event is fire on every sunday(UTC).
@@ -75,6 +79,7 @@ jobs:
7579
# NODEJS_TYPE_VARS_FILE : specify custom variables file
7680
# * NPM_TOKEN : The token for publishing to npm
7781
# FORCE_PUBLISHER : nodejs major version to publish packages
82+
# FORCE_NOT_PUBLISHER : do not allow to publish any packages(for forked repository)
7883
# USE_PACKAGECLOUD_REPO : true means using pacakgecloud.io repo, false is not using
7984
# PACKAGECLOUD_OWNER : owner name as a pat of path to packagcloud.io for downloading
8085
# PACKAGECLOUD_DOWNLOAD_REPO : repo name as a pat of path to packagcloud.io for downloading
@@ -86,6 +91,7 @@ jobs:
8691
echo "ENV_NODEJS_TYPE_VARS_FILE=${{ secrets.NODEJS_TYPE_VARS_FILE }}" >> "${GITHUB_ENV}"
8792
echo "ENV_NPM_TOKEN=${{ secrets.NPM_TOKEN }}" >> "${GITHUB_ENV}"
8893
echo "ENV_FORCE_PUBLISHER=${{ secrets.FORCE_PUBLISHER }}" >> "${GITHUB_ENV}"
94+
echo "ENV_FORCE_NOT_PUBLISHER=${{ secrets.FORCE_NOT_PUBLISHER }}" >> "${GITHUB_ENV}"
8995
echo "ENV_USE_PACKAGECLOUD_REPO=${{ secrets.USE_PACKAGECLOUD_REPO }}" >> "${GITHUB_ENV}"
9096
echo "ENV_PACKAGECLOUD_OWNER=${{ secrets.PACKAGECLOUD_OWNER }}" >> "${GITHUB_ENV}"
9197
echo "ENV_PACKAGECLOUD_DOWNLOAD_REPO=${{ secrets.PACKAGECLOUD_DOWNLOAD_REPO }}" >> "${GITHUB_ENV}"

‎.github/workflows/nodejs_helper.sh‎

Lines changed: 44 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#
1919
# AUTHOR: Takeshi Nakatani
2020
# CREATE: Tue, Nov 24 2020
21-
# REVISION: 1.3
21+
# REVISION: 1.5
2222
#
2323

2424
#==============================================================
@@ -71,6 +71,7 @@ CI_PACKAGECLOUD_OWNER="antpickax"
7171
CI_PACKAGECLOUD_DOWNLOAD_REPO="stable"
7272
CI_NPM_TOKEN=""
7373
CI_FORCE_PUBLISHER=""
74+
CI_FORCE_NOT_PUBLISHER=0
7475

7576
CI_IN_SCHEDULE_PROCESS=0
7677
CI_PUBLISH_TAG_NAME=""
@@ -169,6 +170,7 @@ func_usage()
169170
echo " --nodejstype-vars-file(-f) <file path> specify the file that describes the package list to be installed before build(default is nodejstypevars.sh)"
170171
echo " --npm-token(-token) <token> npm token for uploading(specify when uploading)"
171172
echo " --force-publisher(-fp) <version> specify publisher node major version(ex. 10/11/12)."
173+
echo " --force-not-publisher(-np) do not allow to publish any packages."
172174
echo ""
173175
echo " Option for packagecloud.io:"
174176
echo " --use-packagecloudio-repo(-usepc) use packagecloud.io repository(default), exclusive -notpc option"
@@ -180,6 +182,7 @@ func_usage()
180182
echo " ENV_NODEJS_TYPE_VARS_FILE the file for custom variables ( same as option '--nodejstype-vars-file(-f)' )"
181183
echo " ENV_NPM_TOKEN the token for publishing to npm ( same as option '--npm-token(-token)' )"
182184
echo " ENV_FORCE_PUBLISHER nodejs major version to publish packages ( same as option '--force-publisher(-fp)' )"
185+
echo " ENV_FORCE_NOT_PUBLISHER do not allow to publish any packages ( same as option '--force-not-publisher(-np)' )"
183186
echo " ENV_USE_PACKAGECLOUD_REPO use packagecloud.io repository: true/false ( same as option '--use-packagecloudio-repo(-usepc)' and '--not-use-packagecloudio-repo(-notpc)' )"
184187
echo " ENV_PACKAGECLOUD_OWNER owner name for uploading to packagecloud.io ( same as option '--packagecloudio-owner(-pcowner)' )"
185188
echo " ENV_PACKAGECLOUD_DOWNLOAD_REPO repository name of installing packages in packagecloud.io ( same as option '--packagecloudio-download-repo(-pcdlrepo)' )"
@@ -531,6 +534,7 @@ PRNTITLE "Start to check options and environments"
531534
OPT_NODEJS_TYPE=""
532535
OPT_NODEJS_TYPE_VARS_FILE=""
533536
OPT_FORCE_PUBLISHER=""
537+
OPT_FORCE_NOT_PUBLISHER=0
534538
OPT_USE_PACKAGECLOUD_REPO=
535539
OPT_PACKAGECLOUD_OWNER=""
536540
OPT_PACKAGECLOUD_DOWNLOAD_REPO=""
@@ -540,11 +544,11 @@ while [ $# -ne 0 ]; do
540544
if [ -z "$1" ]; then
541545
break
542546

543-
elif [ "$1" = "-h" ] || [ "$1" = "-H" ] || [ "$1" = "--help" ] || [ "$1" = "--HELP" ]; then
547+
elif echo "$1" | grep -q -i -e "^-h$" -e "^--help$"; then
544548
func_usage "${PRGNAME}"
545549
exit 0
546550

547-
elif [ "$1" = "-node" ] || [ "$1" = "-NODE" ] || [ "$1" = "--nodejstype" ] || [ "$1" = "--NODEJSTYPE" ]; then
551+
elif echo "$1" | grep -q -i -e "^-node$" -e "^--nodejstype$"; then
548552
if [ -n "${OPT_NODEJS_TYPE}" ]; then
549553
PRNERR "already set \"--nodejstype(-node)\" option."
550554
exit 1
@@ -556,7 +560,7 @@ while [ $# -ne 0 ]; do
556560
fi
557561
OPT_NODEJS_TYPE="$1"
558562

559-
elif [ "$1" = "-f" ] || [ "$1" = "-F" ] || [ "$1" = "--nodejstype-vars-file" ] || [ "$1" = "--NODEJSTYPE-VARS-FILE" ]; then
563+
elif echo "$1" | grep -q -i -e "^-f$" -e "^--nodejstype-vars-file$"; then
560564
if [ -n "${OPT_NODEJS_TYPE_VARS_FILE}" ]; then
561565
PRNERR "already set \"--nodejstype-vars-file(-f)\" option."
562566
exit 1
@@ -572,9 +576,9 @@ while [ $# -ne 0 ]; do
572576
fi
573577
OPT_NODEJS_TYPE_VARS_FILE="$1"
574578

575-
elif [ "$1" = "-fp" ] || [ "$1" = "-FP" ] || [ "$1" = "--force-publisher" ] || [ "$1" = "--FORCE-PUBLISHER" ]; then
579+
elif echo "$1" | grep -q -i -e "^-fp$" -e "^--force-publisher$"; then
576580
if [ -n "${OPT_FORCE_PUBLISHER}" ]; then
577-
PRNERR "already set \"--force-publisher(-fp)\" or \"--not-publish(-np)\" option."
581+
PRNERR "already set \"--force-publisher(-fp)\" option."
578582
exit 1
579583
fi
580584
shift
@@ -588,21 +592,28 @@ while [ $# -ne 0 ]; do
588592
fi
589593
OPT_FORCE_PUBLISHER="$1"
590594

591-
elif [ "$1" = "-usepc" ] || [ "$1" = "-USEPC" ] || [ "$1" = "--use-packagecloudio-repo" ] || [ "$1" = "--USE-PACKAGECLOUDIO-REPO" ]; then
595+
elif echo "$1" | grep -q -i -e "^-np$" -e "^--force-not-publisher$"; then
596+
if [ "${OPT_FORCE_NOT_PUBLISHER}" -ne 0 ]; then
597+
PRNERR "already set \"--force-not-publisher(-np)\" option."
598+
exit 1
599+
fi
600+
OPT_FORCE_NOT_PUBLISHER="$1"
601+
602+
elif echo "$1" | grep -q -i -e "^-usepc$" -e "^--use-packagecloudio-repo$"; then
592603
if [ -n "${OPT_USE_PACKAGECLOUD_REPO}" ]; then
593604
PRNERR "already set \"--use-packagecloudio-repo(-usepc)\" or \"--not-use-packagecloudio-repo(-notpc)\" option."
594605
exit 1
595606
fi
596607
OPT_USE_PACKAGECLOUD_REPO=1
597608

598-
elif [ "$1" = "-notpc" ] || [ "$1" = "-NOTPC" ] || [ "$1" = "--not-use-packagecloudio-repo" ] || [ "$1" = "--NOT-USE-PACKAGECLOUDIO-REPO" ]; then
609+
elif echo "$1" | grep -q -i -e "^-notpc$" -e "^--not-use-packagecloudio-repo$"; then
599610
if [ -n "${OPT_USE_PACKAGECLOUD_REPO}" ]; then
600611
PRNERR "already set \"--use-packagecloudio-repo(-usepc)\" or \"--not-use-packagecloudio-repo(-notpc)\" option."
601612
exit 1
602613
fi
603614
OPT_USE_PACKAGECLOUD_REPO=0
604615

605-
elif [ "$1" = "-token" ] || [ "$1" = "-TOKEN" ] || [ "$1" = "--npm-token" ] || [ "$1" = "--NPM-TOKEN" ]; then
616+
elif echo "$1" | grep -q -i -e "^-token$" -e "^--npm-token$"; then
606617
if [ -n "${OPT_NPM_TOKEN}" ]; then
607618
PRNERR "already set \"--npm-token(-token)\" option."
608619
exit 1
@@ -614,7 +625,7 @@ while [ $# -ne 0 ]; do
614625
fi
615626
OPT_NPM_TOKEN="$1"
616627

617-
elif [ "$1" = "-pcowner" ] || [ "$1" = "-PCOWNER" ] || [ "$1" = "--packagecloudio-owner" ] || [ "$1" = "--PACKAGECLOUDIO-OWNER" ]; then
628+
elif echo "$1" | grep -q -i -e "^-pcowner$" -e "^--packagecloudio-owner$"; then
618629
if [ -n "${OPT_PACKAGECLOUD_OWNER}" ]; then
619630
PRNERR "already set \"--packagecloudio-owner(-pcowner)\" option."
620631
exit 1
@@ -626,7 +637,7 @@ while [ $# -ne 0 ]; do
626637
fi
627638
OPT_PACKAGECLOUD_OWNER="$1"
628639

629-
elif [ "$1" = "-pcdlrepo" ] || [ "$1" = "-PCDLREPO" ] || [ "$1" = "--packagecloudio-download-repo" ] || [ "$1" = "--PACKAGECLOUDIO-DOWNLOAD-REPO" ]; then
640+
elif echo "$1" | grep -q -i -e "^-pcdlrepo$" -e "^--packagecloudio-download-repo$"; then
630641
if [ -n "${OPT_PACKAGECLOUD_DOWNLOAD_REPO}" ]; then
631642
PRNERR "already set \"--packagecloudio-download-repo(-pcdlrepo)\" option."
632643
exit 1
@@ -680,6 +691,19 @@ elif [ -n "${ENV_FORCE_PUBLISHER}" ]; then
680691
CI_FORCE_PUBLISHER="${ENV_FORCE_PUBLISHER}"
681692
fi
682693

694+
if [ "${OPT_FORCE_NOT_PUBLISHER}" -ne 0 ]; then
695+
CI_FORCE_NOT_PUBLISHER=1
696+
elif [ -n "${ENV_FORCE_NOT_PUBLISHER}" ]; then
697+
if [ "${ENV_FORCE_NOT_PUBLISHER}" = "true" ] || [ "${ENV_FORCE_NOT_PUBLISHER}" -eq 1 ]; then
698+
CI_FORCE_NOT_PUBLISHER=1
699+
fi
700+
fi
701+
702+
if [ -n "${CI_FORCE_PUBLISHER}" ] && [ "${CI_FORCE_NOT_PUBLISHER}" -ne 0 ]; then
703+
PRNERR "\"FORCE_PUBLISHER\"(ENV or --force-publisher(-fp) option) and \"FORCE_NOT_PUBLISHER\"(ENV or --force-not-publisher(-np) option) cannot be specified together."
704+
exit 1
705+
fi
706+
683707
if [ -n "${OPT_USE_PACKAGECLOUD_REPO}" ]; then
684708
if [ "${OPT_USE_PACKAGECLOUD_REPO}" -eq 1 ]; then
685709
CI_USE_PACKAGECLOUD_REPO=1
@@ -793,13 +817,15 @@ PRNTITLE "Check whether to execute processes"
793817
#
794818
# Check whether to publish
795819
#
796-
if [ "${IS_PUBLISHER}" -eq 1 ] || { [ -n "${CI_FORCE_PUBLISHER}" ] && [ "${CI_FORCE_PUBLISHER}" = "${CI_NODEJS_MAJOR_VERSION}" ]; }; then
797-
if [ -n "${CI_PUBLISH_TAG_NAME}" ]; then
798-
if [ -z "${CI_NPM_TOKEN}" ]; then
799-
PRNERR "Specified release tag for publish, but NPM token is not specified."
800-
exit 1
820+
if [ "${CI_FORCE_NOT_PUBLISHER}" -eq 0 ]; then
821+
if [ "${IS_PUBLISHER}" -eq 1 ] || { [ -n "${CI_FORCE_PUBLISHER}" ] && [ "${CI_FORCE_PUBLISHER}" = "${CI_NODEJS_MAJOR_VERSION}" ]; }; then
822+
if [ -n "${CI_PUBLISH_TAG_NAME}" ]; then
823+
if [ -z "${CI_NPM_TOKEN}" ]; then
824+
PRNERR "Specified release tag for publish, but NPM token is not specified."
825+
exit 1
826+
fi
827+
CI_DO_PUBLISH=1
801828
fi
802-
CI_DO_PUBLISH=1
803829
fi
804830
fi
805831

@@ -826,6 +852,7 @@ echo " CI_PACKAGECLOUD_OWNER = ${CI_PACKAGECLOUD_OWNER}"
826852
echo " CI_PACKAGECLOUD_DOWNLOAD_REPO = ${CI_PACKAGECLOUD_DOWNLOAD_REPO}"
827853
echo " CI_NPM_TOKEN = **********"
828854
echo " CI_FORCE_PUBLISHER = ${CI_FORCE_PUBLISHER}"
855+
echo " CI_FORCE_NOT_PUBLISHER = ${CI_FORCE_NOT_PUBLISHER}"
829856
echo " CI_PUBLISH_TAG_NAME = ${CI_PUBLISH_TAG_NAME}"
830857
echo " CI_DO_PUBLISH = ${CI_DO_PUBLISH}"
831858
echo ""

‎.github/workflows/nodejstypevars.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ elif [ "${CI_NODEJS_MAJOR_VERSION}" = "18" ]; then
6868
INSTALL_PKG_LIST="git gcc g++ make k2hash-dev"
6969
INSTALLER_BIN="apt-get"
7070
INSTALL_QUIET_ARG="-qq"
71-
IS_PUBLISHER=1
71+
IS_PUBLISHER=0
7272

7373
elif [ "${CI_NODEJS_MAJOR_VERSION}" = "20" ]; then
7474
INSTALL_PKG_LIST="git gcc g++ make k2hash-dev"
@@ -80,7 +80,7 @@ elif [ "${CI_NODEJS_MAJOR_VERSION}" = "22" ]; then
8080
INSTALL_PKG_LIST="git gcc g++ make k2hash-dev"
8181
INSTALLER_BIN="apt-get"
8282
INSTALL_QUIET_ARG="-qq"
83-
IS_PUBLISHER=0
83+
IS_PUBLISHER=1
8484
fi
8585

8686
#---------------------------------------------------------------

‎AUTHORS‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
1-
1. Taku Ishihara <taishiha@yahoo-corp.jp >
2-
3-
Wrote from scratch the initial version of k2hash nodejs addon.
4-
5-
2. Takeshi Nakatani <ggtakec@gmail.com>
1+
1. Takeshi Nakatani <ggtakec@gmail.com>
62

73
Develops and other improvements k2hash nodejs addon.
84

9-
3. Hirotaka Wakabayashi <hiwakaba@yahoo-corp.jp>
5+
2. Hirotaka Wakabayashi <hiwakaba@lycorp.co.jp>
106

117
Develops and other improvements k2hash nodejs addon.

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
},
5353
"author": "Takeshi Nakatani <ggtakec@gmail.com> (https://github.com/ggtakec)",
5454
"contributors": [
55-
"Hirotaka Wakabayashi <hiwakaba@yahoo-corp.jp> (https://github.com/hiwakaba)"
55+
"Hirotaka Wakabayashi <hiwakaba@lycorp.co.jp> (https://github.com/hiwakaba)"
5656
],
5757
"license": "MIT"
5858
}

‎tests/test.sh‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -78,11 +78,11 @@ while [ $# -ne 0 ]; do
7878
if [ -z "$1" ]; then
7979
break
8080

81-
elif [ "$1" = "-h" ] || [ "$1" = "-H" ] || [ "$1" = "--help" ] || [ "$1" = "--HELP" ]; then
81+
elif echo "$1" | grep -q -i -e "^-h$" -e "^--help$"; then
8282
PrintUsage "${PRGNAME}"
8383
exit 0
8484

85-
elif [ "$1" = "-d" ] || [ "$1" = "-D" ] || [ "$1" = "--debuglevel" ] || [ "$1" = "--DEBUGLEVEL" ]; then
85+
elif echo "$1" | grep -q -i -e "^-d$" -e "^--debuglevel$"; then
8686
#
8787
# DEBUG option
8888
#
@@ -95,21 +95,20 @@ while [ $# -ne 0 ]; do
9595
echo "[ERROR] --debuglevel(-d) option needs parameter(info/warn/err/silent)"
9696
exit 1
9797
fi
98-
99-
if [ "$1" = "info" ] || [ "$1" = "INFO" ]; then
98+
if echo "$1" | grep -q -i "^info$"; then
10099
DEBUG_MODE="INFO"
101-
elif [ "$1" = "wan" ] || [ "$1" = "WAN" ] || [ "$1" = "warn" ] || [ "$1" = "WARN" ] || [ "$1" = "warning" ] || [ "$1" = "WARNING" ]; then
100+
elif echo "$1" | grep -q -i -e "^wan$" -e "^warn$" -e "^warning$"; then
102101
DEBUG_MODE="WAN"
103-
elif [ "$1" = "err" ] || [ "$1" = "ERR" ] || [ "$1" = "error" ] || [ "$1" = "ERROR" ]; then
102+
elif echo "$1" | grep -q -i -e "^err$" -e "^error$"; then
104103
DEBUG_MODE="ERR"
105-
elif [ "$1" = "silent" ] || [ "$1" = "SILENT" ] || [ "$1" = "slt" ] || [ "$1" = "SLT" ]; then
104+
elif echo "$1" | grep -q -i -e "^silent$" -e "^slt$"; then
106105
DEBUG_MODE="SILENT"
107106
else
108107
echo "[ERROR] Unknown --debuglevel(-d) option parameter(info/warn/err/silent) : $1"
109108
exit 1
110109
fi
111110

112-
elif [ "$1" = "--logfile" ] || [ "$1" = "--LOGFILE" ] || [ "$1" = "-l" ] || [ "$1" = "-L" ]; then
111+
elif echo "$1" | grep -q -i -e "^-l$" -e "^--logfile$"; then
113112
#
114113
# LOG FILE option
115114
#

0 commit comments

Comments
 (0)