From f22a086826f0d2259d3af5bc2b1258743f99eee2 Mon Sep 17 00:00:00 2001
From: jvoisin
Date: Sun, 20 Mar 2022 19:58:26 +0100
Subject: Install re2c in the CI

---
 .github/workflows/distributions_php7.yml | 10 +++++-----
 .github/workflows/distributions_php8.yml | 10 +++++-----
 src/config.m4                            |  4 +++-
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/distributions_php7.yml b/.github/workflows/distributions_php7.yml
index 11222fb..12fa207 100644
--- a/.github/workflows/distributions_php7.yml
+++ b/.github/workflows/distributions_php7.yml
@@ -1,4 +1,4 @@
-name: CI for linux distributions
+name: CI for linux distributions on PHP7
 on:
   pull_request:
   push:
@@ -18,7 +18,7 @@ jobs:
       - name: Install dependencies
         run: |
           apt update
-          DEBIAN_FRONTEND=noninteractive apt install -y php-dev php-pear
+          DEBIAN_FRONTEND=noninteractive apt install -y php-dev php-pear re2c
       - name: Install pecl
         run: pecl install vld-beta
       - name: Build and run the testsuite
@@ -38,7 +38,7 @@ jobs:
         run: rm -rf src/tests/*php8*/ src/tests/*/*_php8.phpt src/tests/disable_function/*_signal.phpt
       - name: Install dependencies
         run: |
-          dnf install -y php-devel php-pear make
+          dnf install -y php-devel php-pear make re2c
       - name: Install pecl
         run: pecl install vld-beta
       - name: Build and run the testsuite
@@ -80,7 +80,7 @@ jobs:
       - name: Install dependencies
         continue-on-error: true
         run: |
-          pacman --sync --refresh --noconfirm --quiet php wget autoconf gcc make
+          pacman --sync --refresh --noconfirm --quiet php wget autoconf gcc make re2c
           wget https://pear.php.net/go-pear.phar
           php go-pear.phar
       - name: Install pecl
@@ -106,7 +106,7 @@ jobs:
       - name: Remove tests failing on alpine for wathever reason
         run: rm -rf src/tests/cookies_encryption_warning src/tests/upload_validation/upload_validation.phpt /tests/broken_configuration/encrypt_regexp_cookies_bad_regexp.phpt
       - name: Install dependencies
-        run: apk add php7-dev php7-cgi php7-simplexml php7-xml pcre-dev build-base php7-pear php7-openssl php7-session bash grep
+        run: apk add php7-dev php7-cgi php7-simplexml php7-xml pcre-dev build-base php7-pear php7-openssl php7-session bash grep re2c
       - name: Install pecl
         continue-on-error: true
         run: pecl install vld-beta
diff --git a/.github/workflows/distributions_php8.yml b/.github/workflows/distributions_php8.yml
index de912eb..67985de 100644
--- a/.github/workflows/distributions_php8.yml
+++ b/.github/workflows/distributions_php8.yml
@@ -17,7 +17,7 @@ jobs:
       - name: Remove tests failing on alpine for wathever reason
         run: rm -rf src/tests/*session*/ src/tests/broken_configuration/ src/tests/*cookie* src/tests/upload_validation/
       - name: Install dependencies
-        run: apk add php8-dev php8-cgi php8-simplexml php8-xml pcre-dev build-base php8-pear php8-openssl
+        run: apk add php8-dev php8-cgi php8-simplexml php8-xml pcre-dev build-base php8-pear php8-openssl re2c
       - name: Install pecl
         continue-on-error: true
         run: pecl install vld-beta
@@ -40,7 +40,7 @@ jobs:
       - name: Install dependencies
         run: |
           apt update
-          DEBIAN_FRONTEND=noninteractive apt install -y php-dev php-pear
+          DEBIAN_FRONTEND=noninteractive apt install -y php-dev php-pear re2c
       - name: Install pecl
         run: pecl install vld-beta
       - name: Build and run the testsuite
@@ -58,7 +58,7 @@ jobs:
         uses: actions/checkout@v2
       - name: Install dependencies
         run: |
-          dnf install -y php-devel php-pear make
+          dnf install -y php-devel php-pear make re2c
       - name: Install pecl
         run: pecl install vld-beta
       - name: Build and run the testsuite
@@ -77,7 +77,7 @@ jobs:
       - name: Install dependencies
         continue-on-error: true
         run: |
-          pacman --sync --refresh --noconfirm --quiet php8 wget autoconf gcc make
+          pacman --sync --refresh --noconfirm --quiet php8 wget autoconf gcc make re2c
           wget https://pear.php.net/go-pear.phar
           php go-pear.phar
       - name: Install pecl
@@ -101,7 +101,7 @@ jobs:
       - name: Remove tests failing on alpine for wathever reason
         run: rm -rf src/tests/cookies_encryption_warning src/tests/upload_validation/upload_validation.phpt
       - name: Install dependencies
-        run: apk add php8-dev php8-cgi php8-simplexml php8-xml pcre-dev build-base php8-pear php8-openssl php8-session php8-curl bash grep
+        run: apk add php8-dev php8-cgi php8-simplexml php8-xml pcre-dev build-base php8-pear php8-openssl php8-session php8-curl bash grep re2c
       - name: Install pecl
         continue-on-error: true
         run: pecl install vld-beta
diff --git a/src/config.m4 b/src/config.m4
index faf5f92..78ca6a2 100644
--- a/src/config.m4
+++ b/src/config.m4
@@ -45,5 +45,7 @@ if test "$PHP_SNUFFLEUPAGUS" = "yes"; then
    PHP_NEW_EXTENSION(snuffleupagus, $sources, $ext_shared,-DZEND_ENABLE_STATIC_TSRMLS_CACHE=1)
 fi
 
-PHP_PROG_RE2C([2.0])
+# Uncommend once we don't support Ubuntu Focal Fossa (20.04)
+#PHP_PROG_RE2C([2.0])
+
 PHP_ADD_MAKEFILE_FRAGMENT()
-- 
cgit v1.3