pcre ci

svlobanov · Aug 28, 2024 · 9d65db6 · 9d65db6
1 parent 763594c
commit 9d65db6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/.github/workflows/build-and-run.yml b/.github/workflows/build-and-run.yml
@@ -34,7 +34,7 @@ jobs:
           sudo apt update && 
           NEEDRESTART_SUSPEND=1 DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true sudo -E apt -y install
           git build-essential cmake gcc linux-headers-`uname -r`
-          libpcre3-dev libssl-dev liblua5.1-0-dev kmod
+          libpcre3-dev libpcre2-dev libssl-dev liblua5.1-0-dev kmod
       - name: Check out repository code
         uses: actions/checkout@v3
         with:
@@ -118,7 +118,7 @@ jobs:
           apt update && apt -y upgrade && apt -y dist-upgrade &&
           NEEDRESTART_SUSPEND=1 DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true apt -y install git build-essential cmake gcc 
           linux-headers-${{ env.HEADERS_SUFFIX }}
-          libpcre3-dev libssl-dev liblua5.1-0-dev kmod
+          libpcre3-dev libpcre2-dev libssl-dev liblua5.1-0-dev kmod
       - name: Get kernel name from headers
         run: >
           echo KERNEL_NAME=`ls -1 /usr/src/ | grep  'linux-headers.*${{ env.HEADERS_SUFFIX }}' | 
@@ -177,7 +177,7 @@ jobs:
         run: >
           apt update && apt -y upgrade && apt -y dist-upgrade &&
           DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true apt -y install git build-essential cmake gcc
-          linux-headers-generic libpcre3-dev libssl-dev liblua5.1-0-dev kmod software-properties-common
+          linux-headers-generic libpcre3-dev libpcre2-dev libssl-dev liblua5.1-0-dev kmod software-properties-common
           pkexec dbus linux-base &&
           add-apt-repository -y ppa:cappelikan/ppa && apt update &&
           service dbus start &&
@@ -222,7 +222,7 @@ jobs:
     steps:
       - name: Install build tools
         run: >
-          apk update && apk add --no-cache git cmake make g++ pcre-dev libressl-dev linux-headers libucontext-dev lua5.1-dev
+          apk update && apk add --no-cache git cmake make g++ pcre-dev pcre2-dev libressl-dev linux-headers libucontext-dev lua5.1-dev
       - name: Check out repository code
         uses: actions/checkout@v3
         with:
@@ -259,7 +259,7 @@ jobs:
       - name: Install build tools
         run: |
           emerge -g --autounmask-write sys-kernel/gentoo-kernel-bin || (etc-update --verbose --automode -5 && emerge -g sys-kernel/gentoo-kernel-bin)
-          emerge -g dev-vcs/git dev-libs/libpcre dev-build/cmake dev-lang/lua:5.1
+          emerge -g dev-vcs/git dev-libs/libpcre dev-libs/libpcre2 dev-build/cmake dev-lang/lua:5.1
       - name: Check out repository code
         uses: actions/checkout@v4
         with:

diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -117,7 +117,7 @@ jobs:
         run: >
           ssh -i ssh-key -p2222 user@localhost "sudo apt -y install
           git build-essential cmake gcc linux-headers-\`uname -r\` 
-          libpcre3-dev libssl-dev liblua5.1-0-dev kmod python3-pip 
+          libpcre3-dev libpcre2-dev libssl-dev liblua5.1-0-dev kmod python3-pip 
           libxml2-dev libxslt1-dev zlib1g-dev 
           iproute2 ppp pppoe isc-dhcp-client timelimit && 
           (sudo pip3 install pytest pytest-dependency pytest-order || sudo pip3 install --break-system-packages pytest pytest-dependency pytest-order)"
@@ -195,7 +195,7 @@ jobs:
           sudo apt update && 
           NEEDRESTART_SUSPEND=1 DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true sudo -E apt -y install
           git build-essential cmake gcc linux-headers-`uname -r`
-          libpcre3-dev libssl-dev liblua5.1-0-dev kmod python3-pip 
+          libpcre3-dev libpcre2-dev libssl-dev liblua5.1-0-dev kmod python3-pip 
           iproute2 ppp pppoe isc-dhcp-client
 
       - name: Install testing tools (using pip)
@@ -248,7 +248,7 @@ jobs:
           sudo apt update && 
           NEEDRESTART_SUSPEND=1 DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true sudo -E apt -y install
           git build-essential cmake gcc linux-headers-`uname -r`
-          libpcre3-dev libssl-dev liblua5.1-0-dev kmod python3-pip 
+          libpcre3-dev libpcre2-dev libssl-dev liblua5.1-0-dev kmod python3-pip 
           iproute2 ppp pppoe isc-dhcp-client
 
       - name: Install testing tools (using pip)