summaryrefslogtreecommitdiff
path: root/.github
diff options
context:
space:
mode:
authorSergey V. Lobanov <sergey@lobanov.in>2024-09-02 12:47:41 +0000
committerSergey V. Lobanov <sergey@lobanov.in>2024-09-02 12:47:41 +0000
commit2c7397c4f2fb1ab1cd76426e40bb05c8a8ccacf2 (patch)
tree723f476cd685c161bdbacf67cf4933090414edcb /.github
parentcbfa3efe7ae135b4ae8890485701677f56087f50 (diff)
downloadaccel-ppp-2c7397c4f2fb1ab1cd76426e40bb05c8a8ccacf2.tar.gz
accel-ppp-2c7397c4f2fb1ab1cd76426e40bb05c8a8ccacf2.zip
ci: change libpcre to libpcre2
Diffstat (limited to '.github')
-rw-r--r--.github/workflows/build-and-run.yml10
-rw-r--r--.github/workflows/run-tests.yml8
2 files changed, 9 insertions, 9 deletions
diff --git a/.github/workflows/build-and-run.yml b/.github/workflows/build-and-run.yml
index 591d8cbf..99db25f1 100644
--- 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
+ 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
+ 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 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++ 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/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
index 849ff6d6..d6833378 100644
--- 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
+ 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)"
@@ -247,7 +247,7 @@ jobs:
ssh -i ssh-key -p2222 alpine@localhost "doas cat /etc/passwd"
- name: Install build tools (on target OS)
run: >
- ssh -i ssh-key -p2222 alpine@localhost "doas apk add --no-cache git cmake make g++ pcre-dev libressl-dev linux-headers libucontext-dev lua5.1-dev linux-lts-dev py3-pip
+ ssh -i ssh-key -p2222 alpine@localhost "doas apk add --no-cache git cmake make g++ pcre2-dev libressl-dev linux-headers libucontext-dev lua5.1-dev linux-lts-dev py3-pip
ppp ppp-pppoe &&
(doas pip3 install pytest pytest-dependency pytest-order || doas pip3 install --break-system-packages pytest pytest-dependency pytest-order)"
- name: Copy source code to target OS
@@ -325,7 +325,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
+ libpcre2-dev libssl-dev liblua5.1-0-dev kmod python3-pip
iproute2 ppp pppoe isc-dhcp-client
- name: Install testing tools (using pip)
@@ -378,7 +378,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
+ libpcre2-dev libssl-dev liblua5.1-0-dev kmod python3-pip
iproute2 ppp pppoe isc-dhcp-client
- name: Install testing tools (using pip)