feat: update PCRE dependency to lrexlib-pcre2 (#163)

* feat: upgrade to lrexlib-pcre2 - update rockspec dependency - update rockspec template - rex_pcre2 Fixes #156 * ci: install correct dependencies for PCRE2
casbin · Nov 28, 2024 · 17d10b0 · 17d10b0
1 parent 7ee85ed
commit 17d10b0
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/.github/luarocks-template.rockspec b/.github/luarocks-template.rockspec
@@ -15,7 +15,7 @@ description = {
 dependencies = {
    "lua >= 5.1",
    "lualogging >= 1.5.1",
-   "lrexlib-pcre >= 2.9.1",
+   "lrexlib-pcre2 >= 2.9.2",
    "luaposix = 35.1-1"
 }
 build = {

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -59,7 +59,7 @@ jobs:
         do
           sleep 1 
         done
-        until luarocks install lrexlib-pcre
+        until luarocks install lrexlib-pcre2
         do
           sleep 1
         done
@@ -109,7 +109,7 @@ jobs:
     - name: Install dependencies
       run: |
         luarocks install lualogging
-        luarocks install lrexlib-pcre
+        luarocks install lrexlib-pcre2
         luarocks install luaposix
         luarocks install luasocket
         luarocks install busted

diff --git a/casbin-1.41.1-1.rockspec b/casbin-1.41.1-1.rockspec
@@ -17,7 +17,7 @@ description = {
 dependencies = {
    "lua >= 5.1",
    "lualogging >= 1.5.1",
-   "lrexlib-pcre >= 2.9.1",
+   "lrexlib-pcre2 >= 2.9.2",
    "luaposix = 35.1-1"
 }
 build = {

diff --git a/src/util/BuiltInFunctions.lua b/src/util/BuiltInFunctions.lua
@@ -12,7 +12,7 @@
 --See the License for the specific language governing permissions and
 --limitations under the License.
 
-local rex = require ("rex_pcre")
+local rex = require ("rex_pcre2")
 local posix = require("posix.fnmatch")
 
 local BuiltInFunctions = {}