Merge branch 'master' into fix-match-groups-replace

uhop · Aug 23, 2023 · 6272a8f · 6272a8f
2 parents 3a640ba + 8664d4a
commit 6272a8f
Show file tree

Hide file tree

Showing 10 changed files with 26 additions and 12 deletions.
diff --git a/.github/actions/linux-alpine-node-16/entrypoint.sh b/.github/actions/linux-alpine-node-16/entrypoint.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+set -e
+
 npm config set unsafe-perm true
 export USERNAME=`whoami`
 export DEVELOPMENT_SKIP_GETTING_ASSET=true

diff --git a/.github/actions/linux-alpine-node-18/entrypoint.sh b/.github/actions/linux-alpine-node-18/entrypoint.sh
@@ -1,6 +1,8 @@
 #!/bin/sh
 
-npm config set unsafe-perm true
+set -e
+
+#npm config set unsafe-perm true
 export USERNAME=`whoami`
 export DEVELOPMENT_SKIP_GETTING_ASSET=true
 npm i

diff --git a/.github/actions/linux-alpine-node-20/entrypoint.sh b/.github/actions/linux-alpine-node-20/entrypoint.sh
@@ -1,6 +1,8 @@
 #!/bin/sh
 
-npm config set unsafe-perm true
+set -e
+
+#npm config set unsafe-perm true
 export USERNAME=`whoami`
 export DEVELOPMENT_SKIP_GETTING_ASSET=true
 npm i

diff --git a/.github/actions/linux-node-12/entrypoint.sh b/.github/actions/linux-node-12/entrypoint.sh
@@ -1,5 +1,7 @@
 #!/bin/bash -l
 
+set -e
+
 NVM_DIR=$HOME/.nvm
 
 curl -sS -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.2/install.sh | bash

diff --git a/.github/actions/linux-node-18/entrypoint.sh b/.github/actions/linux-node-18/entrypoint.sh
@@ -1,6 +1,8 @@
 #!/bin/sh
 
-npm config set unsafe-perm true
+set -e
+
+#npm config set unsafe-perm true
 export USERNAME=`whoami`
 export DEVELOPMENT_SKIP_GETTING_ASSET=true
 npm i

diff --git a/.github/actions/linux-node-20/entrypoint.sh b/.github/actions/linux-node-20/entrypoint.sh
@@ -1,6 +1,8 @@
 #!/bin/sh
 
-npm config set unsafe-perm true
+set -e
+
+#npm config set unsafe-perm true
 export USERNAME=`whoami`
 export DEVELOPMENT_SKIP_GETTING_ASSET=true
 npm i

diff --git a/README.md b/README.md
@@ -353,7 +353,8 @@ console.log('re2_res : ' + re2_res); // prints: re2_res : abc,a,b,c
 
 ## Release history
 
-- 1.20.2 *Fix: subsequent numbers are incorporated into group if they would form a legal group reference.*
+- 1.20.3 *Fix: subsequent numbers are incorporated into group if they would form a legal group reference.*
+- 1.20.2 *Fix: added a missing C++ file, which caused a bug on Alpine Linux. Thx, [rbitanga-manticore](https://github.com/rbitanga-manticore).*
 - 1.20.1 *Fix: files included in the npm package to build the C++ code.*
 - 1.20.0 *Updated RE2. New version uses `abseil-cpp` and required the adaptation work. Thx, [Stefano Rivera](https://github.com/stefanor).*
 - 1.19.2 *Bugfix: infinite loop in matchAll() with empty matches. Thx, [ziyunfei](https://github.com/ziyunfei).*

diff --git a/binding.gyp b/binding.gyp
@@ -47,6 +47,7 @@
         "vendor/abseil-cpp/absl/base/internal/throw_delegate.cc",
         "vendor/abseil-cpp/absl/base/internal/unscaledcycleclock.cc",
         "vendor/abseil-cpp/absl/container/internal/raw_hash_set.cc",
+        "vendor/abseil-cpp/absl/debugging/internal/address_is_readable.cc",
         "vendor/abseil-cpp/absl/debugging/stacktrace.cc",
         "vendor/abseil-cpp/absl/debugging/symbolize.cc",
         "vendor/abseil-cpp/absl/flags/commandlineflag.cc",

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -16,7 +16,7 @@
     "node-gyp": "^9.4.0"
   },
   "devDependencies": {
-    "@types/node": "^20.4.5",
+    "@types/node": "^20.5.3",
     "heya-unit": "^0.3.0",
     "typescript": "^5.1.6"
   },