Merge pull request #48 from ggtakec/update_runner_os

Changed CI Runner OS and updated dependencies
yahoojapan · Nov 1, 2023 · f387ace · f387ace
2 parents 6ff8674 + 6804e07
commit f387ace
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 9 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -37,11 +37,7 @@ on:
 #
 jobs:
   build:
-    # [NOTE]
-    # We plan to update to ubuntu-latest (22.04) soon.
-    # Right now I am forced to use 20.04 as there are no relevant packages yet.
-    #
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
 
     strategy:
       #

diff --git a/package.json b/package.json
@@ -13,7 +13,7 @@
   },
   "devDependencies": {
     "chai": "^4.3.10",
-    "mocha": "^10.0.0"
+    "mocha": "^10.2.0"
   },
   "scripts": {
     "build": "npm run build:before && npm run build:configure && npm run build:rebuild && npm run build:linkdir && npm run build:after",

diff --git a/src/k2hdkc_cbs.cc b/src/k2hdkc_cbs.cc
@@ -71,7 +71,7 @@ bool StackEmitCB::Set(const char* pemitname, Nan::Callback* cbfunc)
 
 	while(!flck_trylock_noshared_mutex(&lockval));	// LOCK
 
-	Nan::Callback*	oldcbfunc = RawFind(pemitname);
+	const Nan::Callback*	oldcbfunc = RawFind(pemitname);
 	if(oldcbfunc){
 		EmitCbsMap.erase(stremit);
 	}
@@ -92,7 +92,7 @@ bool StackEmitCB::Unset(const char* pemitname)
 
 	while(!flck_trylock_noshared_mutex(&lockval));	// LOCK
 
-	Nan::Callback*	oldcbfunc = RawFind(pemitname);
+	const Nan::Callback*	oldcbfunc = RawFind(pemitname);
 	if(oldcbfunc){
 		EmitCbsMap.erase(stremit);
 	}

diff --git a/src/k2hdkc_node.cc b/src/k2hdkc_node.cc
@@ -1249,7 +1249,7 @@ NAN_METHOD(K2hdkcNode::Clean)
 
 NAN_METHOD(K2hdkcNode::IsPermanent)
 {
-	K2hdkcNode*		obj = Nan::ObjectWrap::Unwrap<K2hdkcNode>(info.This());
+	const K2hdkcNode*	obj = Nan::ObjectWrap::Unwrap<K2hdkcNode>(info.This());
 
 	if(obj->_k2hdkcslave){
 		info.GetReturnValue().Set(Nan::True());