From 0a46dd342641c97f88bc172c077b6b0c5c70451a Mon Sep 17 00:00:00 2001
From: Ben Fuhrmannek
Date: Sat, 7 Aug 2021 22:46:56 +0200
Subject: reverse build matrix

---
 .github/workflows/builds.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to '.github/workflows')

diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml
index 67c1135..46eb6f1 100644
--- a/.github/workflows/builds.yml
+++ b/.github/workflows/builds.yml
@@ -7,12 +7,12 @@ jobs:
     strategy:
         matrix:
           container:
-            - php:7.0
-            - php:7.1
-            - php:7.2
-            - php:7.3
-            - php:7.4
             - php:8.0
+            - php:7.4
+            - php:7.3
+            - php:7.2
+            - php:7.1
+            - php:7.0
     container: ${{ matrix.container }}
     steps:
       - name: Checkout code
-- 
cgit v1.3


From 6d5944670cb27a8af69ea14b8c0e3f5f204124ba Mon Sep 17 00:00:00 2001
From: Ben Fuhrmannek
Date: Mon, 13 Dec 2021 13:58:00 +0100
Subject: build sp for php8.1

---
 .github/workflows/builds.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to '.github/workflows')

diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml
index 46eb6f1..f01923e 100644
--- a/.github/workflows/builds.yml
+++ b/.github/workflows/builds.yml
@@ -7,12 +7,13 @@ jobs:
     strategy:
         matrix:
           container:
+            - php:8.1
             - php:8.0
             - php:7.4
             - php:7.3
             - php:7.2
-            - php:7.1
-            - php:7.0
+            # - php:7.1
+            # - php:7.0
     container: ${{ matrix.container }}
     steps:
       - name: Checkout code
-- 
cgit v1.3


From 67edbec4cd01dea6d07fcbdee0d69a62a5ab1238 Mon Sep 17 00:00:00 2001
From: Ben Fuhrmannek
Date: Wed, 5 Jan 2022 19:22:14 +0100
Subject: better github build script

---
 .github/workflows/builds.yml | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

(limited to '.github/workflows')

diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml
index f01923e..6d22bf3 100644
--- a/.github/workflows/builds.yml
+++ b/.github/workflows/builds.yml
@@ -11,23 +11,21 @@ jobs:
             - php:8.0
             - php:7.4
             - php:7.3
-            - php:7.2
-            # - php:7.1
-            # - php:7.0
     container: ${{ matrix.container }}
     steps:
       - name: Checkout code
         uses: actions/checkout@v2
-      - name: Install pecl
+      - name: PHP 7 env setup
         if: startsWith(matrix.container, 'php:7')
-        run: pecl install vld-beta
-      - name: Remove php8 tests on php7
-        if: startsWith(matrix.container, 'php:7')
-        run: rm -rf src/tests/*php8*/
+        run: |
+          pecl install vld-beta
+          rm -rf src/tests/*php8*/ src/tests/*/*_php8.phpt
       - name: Build and run the testsuite
-        run: make tests
+        run: |
+          make release
+          ln -s $(php -r 'echo ini_get("extension_dir");')/* src/modules/
+          make tests
       - name: Show logs in case of failure
         if: ${{ failure() }}
         run: |
-          grep -r . ./src/tests/*/*.out
-          grep -r . ./src/tests/*/*.diff
+          grep -r . --include='*.log' src/tests
-- 
cgit v1.3


From c63f5fd7752f59da1e6568f64d10814103cd7c17 Mon Sep 17 00:00:00 2001
From: Ben Fuhrmannek
Date: Wed, 5 Jan 2022 19:25:39 +0100
Subject: removed test case for github actions + PHP 7

---
 .github/workflows/builds.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to '.github/workflows')

diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml
index 6d22bf3..adc3da9 100644
--- a/.github/workflows/builds.yml
+++ b/.github/workflows/builds.yml
@@ -19,7 +19,7 @@ jobs:
         if: startsWith(matrix.container, 'php:7')
         run: |
           pecl install vld-beta
-          rm -rf src/tests/*php8*/ src/tests/*/*_php8.phpt
+          rm -rf src/tests/*php8*/ src/tests/*/*_php8.phpt src/tests/disable_function/*_signal.phpt
       - name: Build and run the testsuite
         run: |
           make release
-- 
cgit v1.3


From 15c0a1906f2348408bda41fa422afc6389b8cf85 Mon Sep 17 00:00:00 2001
From: Ben Fuhrmannek
Date: Wed, 5 Jan 2022 19:28:55 +0100
Subject: .

---
 .github/workflows/builds.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to '.github/workflows')

diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml
index adc3da9..2038ad7 100644
--- a/.github/workflows/builds.yml
+++ b/.github/workflows/builds.yml
@@ -19,11 +19,12 @@ jobs:
         if: startsWith(matrix.container, 'php:7')
         run: |
           pecl install vld-beta
-          rm -rf src/tests/*php8*/ src/tests/*/*_php8.phpt src/tests/disable_function/*_signal.phpt
+          rm -rf src/tests/*php8*/ src/tests/*/*_php8.phpt
       - name: Build and run the testsuite
         run: |
           make release
           ln -s $(php -r 'echo ini_get("extension_dir");')/* src/modules/
+          rm -f src/tests/disable_function/*_signal.phpt
           make tests
       - name: Show logs in case of failure
         if: ${{ failure() }}
-- 
cgit v1.3


From f9a847bce02880bb067d70739775de488949b1a5 Mon Sep 17 00:00:00 2001
From: BeF
Date: Wed, 5 Jan 2022 21:09:07 +0100
Subject: added codeql workflow

---
 .github/workflows/codeql-analysis.yml | 45 +++++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)
 create mode 100644 .github/workflows/codeql-analysis.yml

(limited to '.github/workflows')

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
new file mode 100644
index 0000000..7b3b6fd
--- /dev/null
+++ b/.github/workflows/codeql-analysis.yml
@@ -0,0 +1,45 @@
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ master ]
+  schedule:
+    - cron: '37 5 * * 3'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    container: php:latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'cpp' ]
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+        # queries: ./path/to/local/query, your-org/your-repo/queries@main
+
+    - run: |
+        make release
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1
-- 
cgit v1.3


From bdefc4361017425d978ac3bfe536f11a0cc88d23 Mon Sep 17 00:00:00 2001
From: BeF
Date: Wed, 5 Jan 2022 21:09:45 +0100
Subject: Delete coverity.yml

---
 .github/workflows/coverity.yml | 43 ------------------------------------------
 1 file changed, 43 deletions(-)
 delete mode 100644 .github/workflows/coverity.yml

(limited to '.github/workflows')

diff --git a/.github/workflows/coverity.yml b/.github/workflows/coverity.yml
deleted file mode 100644
index d83aa9f..0000000
--- a/.github/workflows/coverity.yml
+++ /dev/null
@@ -1,43 +0,0 @@
-name: Coverity scan
-on:
-  schedule:
-    - cron: '0 18 * * 1' # Weekly at 18:00 UTC on Mondays
-
-jobs:
-  latest:
-    runs-on: ubuntu-latest
-    container: debian:stable
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v2
-      - name: Install dependencies
-        run: |
-          apt update
-          DEBIAN_FRONTEND=noninteractive apt install -y --no-install-recommends php-dev curl ca-certificates make gcc
-      - name: Remove php8 tests on php7
-        run: rm -rf src/tests/*php8*/
-      - name: Download Coverity Build Tool
-        run: |
-          curl https://scan.coverity.com/download/linux64 --form token=$TOKEN --form project=jvoisin/snuffleupagus -o cov-analysis-linux64.tar.gz
-          mkdir cov-analysis-linux64
-          tar xzf cov-analysis-linux64.tar.gz --strip-components=1 -C cov-analysis-linux64
-        env:
-          TOKEN: ${{ secrets.COVERITY_SCAN_TOKEN }}
-      - name: Configure
-        run: cd src; phpize; ./configure --enable-snuffleupagus; cd -
-      - name: Build with cov-build
-        run: ./cov-analysis-linux64/bin/cov-build --dir cov-int make compile_debug
-      - name: Submit the result to Coverity Scan
-        run: |
-          tar czf snuffleupagus.tgz cov-int
-          curl \
-            --form project=jvoisin/snuffleupagus \
-            --form token=$TOKEN \
-            --form file=@snuffleupagus.tgz \
-            --form version=master \
-            --form email=julien.voisin+coverity@dustri.org \
-            --form description=master \
-            https://scan.coverity.com/builds?project=jvoisin/snuffleupagus
-        env:
-          TOKEN: ${{ secrets.COVERITY_SCAN_TOKEN }}
-
-- 
cgit v1.3


From 733d803e99dfc9de0489d5b9d8aee5a4d0528411 Mon Sep 17 00:00:00 2001
From: Ben Fuhrmannek
Date: Tue, 11 Jan 2022 15:55:26 +0100
Subject: changed build instructions for github workflows

---
 .github/workflows/distributions.yml      | 52 +++++++++++++++++++++++---------
 .github/workflows/distributions_php8.yml | 32 --------------------
 2 files changed, 38 insertions(+), 46 deletions(-)
 delete mode 100644 .github/workflows/distributions_php8.yml

(limited to '.github/workflows')

diff --git a/.github/workflows/distributions.yml b/.github/workflows/distributions.yml
index 3b90fee..09bff96 100644
--- a/.github/workflows/distributions.yml
+++ b/.github/workflows/distributions.yml
@@ -9,7 +9,7 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v2
       - name: Remove php8 tests for php7
-        run: rm -rf src/tests/*php8*/
+        run: rm -rf src/tests/*php8*/ src/tests/*/*_php8.phpt src/tests/disable_function/*_signal.phpt
       - name: Install dependencies
         run: |
           apt update
@@ -17,12 +17,11 @@ jobs:
       - name: Install pecl
         run: pecl install vld-beta
       - name: Build and run the testsuite
-        run: make tests
+        run: make release tests
       - name: Show logs in case of failure
         if: ${{ failure() }}
         run: |
-          grep -r . ./src/tests/*/*.out
-          grep -r . ./src/tests/*/*.diff
+          grep -r . --include='*.log' src/tests
 
   fedora:
     runs-on: ubuntu-latest
@@ -31,19 +30,18 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v2
       - name: Remove php8 tests for php7
-        run: rm -rf src/tests/*php8*/
+        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
       - name: Install pecl
         run: pecl install vld-beta
       - name: Build and run the testsuite
-        run: make tests
+        run: make release tests
       - name: Show logs in case of failure
         if: ${{ failure() }}
         run: |
-          grep -r . ./src/tests/*/*.out
-          grep -r . ./src/tests/*/*.diff
+          grep -r . --include='*.log' src/tests
 
   ubuntu:
     runs-on: ubuntu-latest
@@ -64,8 +62,7 @@ jobs:
       - name: Show logs in case of failure
         if: ${{ failure() }}
         run: |
-          grep -r . ./src/tests/*/*.out
-          grep -r . ./src/tests/*/*.diff
+          grep -r . --include='*.log' src/tests
 
   archlinux:
     runs-on: ubuntu-latest
@@ -91,8 +88,7 @@ jobs:
         continue-on-error: true
         if: ${{ failure() }}
         run: |
-          grep -r . ./src/tests/*/*.out
-          grep -r . ./src/tests/*/*.diff
+          grep -r . --include='*.log' src/tests
 
   alpine:
     runs-on: ubuntu-latest
@@ -116,5 +112,33 @@ jobs:
         if: ${{ failure() }}
         continue-on-error: true
         run: |
-          grep -r . ./src/tests/*/*.out
-          grep -r . ./src/tests/*/*.diff
+          grep -r . --include='*.log' src/tests
+
+  ## PHP 8
+  alpine:
+    runs-on: ubuntu-latest
+    container: alpine:edge
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+      # - name: Remove php7 tests for php8
+      #   run: rm -rf src/tests/*php7*/
+      # - 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
+      - name: Install pecl
+        continue-on-error: true
+        run: pecl install vld-beta
+      - name: Link phpize
+        run: ln -s /usr/bin/phpize8 /usr/bin/phpize
+      - name: Link php-config
+        run: ln -s /usr/bin/php-config8 /usr/bin/php-config
+      - name: Build and run the testsuite
+        continue-on-error: true
+        run: make tests
+      - name: Show logs in case of failure
+        if: ${{ failure() }}
+        continue-on-error: true
+        run: |
+          grep -r . --include='*.log' src/tests
diff --git a/.github/workflows/distributions_php8.yml b/.github/workflows/distributions_php8.yml
deleted file mode 100644
index f055499..0000000
--- a/.github/workflows/distributions_php8.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-name: CI for linux distributions, on php8
-on: ['pull_request', 'push']
-
-jobs:
-  alpine:
-    runs-on: ubuntu-latest
-    container: alpine:edge
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v2
-      - name: Remove php7 tests for php8
-        run: rm -rf src/tests/*php7*/
-      - 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
-      - name: Install pecl
-        continue-on-error: true
-        run: pecl install vld-beta
-      - name: Link phpize
-        run: ln -s /usr/bin/phpize8 /usr/bin/phpize
-      - name: Link php-config
-        run: ln -s /usr/bin/php-config8 /usr/bin/php-config
-      - name: Build and run the testsuite
-        continue-on-error: true
-        run: make tests
-      - name: Show logs in case of failure
-        if: ${{ failure() }}
-        continue-on-error: true
-        run: |
-          grep -r . ./src/tests/*/*.out
-          grep -r . ./src/tests/*/*.diff
-- 
cgit v1.3


From dab03c5c0df03c4cfda4e0b8a7da62b2feb4e2ac Mon Sep 17 00:00:00 2001
From: Ben Fuhrmannek
Date: Tue, 11 Jan 2022 15:59:48 +0100
Subject: fixed syntax error in yaml

---
 .github/workflows/distributions.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to '.github/workflows')

diff --git a/.github/workflows/distributions.yml b/.github/workflows/distributions.yml
index 09bff96..2cc81d4 100644
--- a/.github/workflows/distributions.yml
+++ b/.github/workflows/distributions.yml
@@ -115,7 +115,7 @@ jobs:
           grep -r . --include='*.log' src/tests
 
   ## PHP 8
-  alpine:
+  alpine_php8:
     runs-on: ubuntu-latest
     container: alpine:edge
     steps:
-- 
cgit v1.3


From e8da4951dabcddd04c6a2e6daa0dea08003e476f Mon Sep 17 00:00:00 2001
From: Ben Fuhrmannek
Date: Wed, 12 Jan 2022 19:50:26 +0100
Subject: fix alpine test setup + minor fixes

---
 .github/workflows/distributions.yml | 40 ++++++++++++++++++-------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

(limited to '.github/workflows')

diff --git a/.github/workflows/distributions.yml b/.github/workflows/distributions.yml
index 2cc81d4..27d0c5d 100644
--- a/.github/workflows/distributions.yml
+++ b/.github/workflows/distributions.yml
@@ -50,7 +50,7 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v2
       - name: Remove php8 tests for php7
-        run: rm -rf src/tests/*php8*/
+        run: rm -rf src/tests/*php8*/ src/tests/*/*_php8.phpt
       - name: Install dependencies
         run: |
           apt update
@@ -71,7 +71,7 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v2
       - name: Remove php8 tests for php7
-        run: rm -rf src/tests/*php8*/
+        run: rm -rf src/tests/*php8*/ src/tests/*/*_php8.phpt
       - name: Install dependencies
         continue-on-error: true
         run: |
@@ -81,7 +81,7 @@ jobs:
       - name: Install pecl
         continue-on-error: true
         run: pecl install vld-beta
-      - name: Build and run the testsuite
+      - name: Build SP and run the testsuite
         continue-on-error: true
         run: make tests
       - name: Show logs in case of failure
@@ -92,22 +92,25 @@ jobs:
 
   alpine:
     runs-on: ubuntu-latest
-    container: alpine:edge
+    container: alpine:latest
     steps:
       - name: Checkout code
         uses: actions/checkout@v2
       - name: Remove php8 tests for php7
-        run: rm -rf src/tests/*php8*/
+        run: rm -rf src/tests/*php8*/ src/tests/*/*_php8.phpt
       - 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/
+        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
+        run: apk add php7-dev php7-cgi php7-simplexml php7-xml pcre-dev build-base php7-pear php7-openssl php7-session
       - name: Install pecl
         continue-on-error: true
         run: pecl install vld-beta
-      - name: Build and run the testsuite
+      - name: Build SP and run the testsuite
         continue-on-error: true
-        run: make tests
+        run: |
+          make release
+          ln -s $(php -r 'echo ini_get("extension_dir");')/* src/modules/
+          make tests
       - name: Show logs in case of failure
         if: ${{ failure() }}
         continue-on-error: true
@@ -121,22 +124,19 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v2
-      # - name: Remove php7 tests for php8
-      #   run: rm -rf src/tests/*php7*/
-      # - 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: 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
+        run: apk add php8-dev php8-cgi php8-simplexml php8-xml pcre-dev build-base php8-pear php8-openssl php8-session php8-curl
       - name: Install pecl
         continue-on-error: true
         run: pecl install vld-beta
-      - name: Link phpize
-        run: ln -s /usr/bin/phpize8 /usr/bin/phpize
-      - name: Link php-config
-        run: ln -s /usr/bin/php-config8 /usr/bin/php-config
-      - name: Build and run the testsuite
+      - name: Build SP and run the testsuite
         continue-on-error: true
-        run: make tests
+        run: |
+          make release
+          ln -s $(php -r 'echo ini_get("extension_dir");')/* src/modules/
+          make tests
       - name: Show logs in case of failure
         if: ${{ failure() }}
         continue-on-error: true
-- 
cgit v1.3


From 6cc6d844da9ae6216e373349413e719fd2465023 Mon Sep 17 00:00:00 2001
From: Ben Fuhrmannek
Date: Wed, 12 Jan 2022 19:55:56 +0100
Subject: more alpine test fixes

---
 .github/workflows/distributions.yml | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to '.github/workflows')

diff --git a/.github/workflows/distributions.yml b/.github/workflows/distributions.yml
index 27d0c5d..79ae9b5 100644
--- a/.github/workflows/distributions.yml
+++ b/.github/workflows/distributions.yml
@@ -101,19 +101,17 @@ 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
+        run: apk add php7-dev php7-cgi php7-simplexml php7-xml pcre-dev build-base php7-pear php7-openssl php7-session bash
       - name: Install pecl
         continue-on-error: true
         run: pecl install vld-beta
       - name: Build SP and run the testsuite
-        continue-on-error: true
         run: |
           make release
           ln -s $(php -r 'echo ini_get("extension_dir");')/* src/modules/
           make tests
       - name: Show logs in case of failure
         if: ${{ failure() }}
-        continue-on-error: true
         run: |
           grep -r . --include='*.log' src/tests
 
@@ -127,18 +125,16 @@ 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
+        run: apk add php8-dev php8-cgi php8-simplexml php8-xml pcre-dev build-base php8-pear php8-openssl php8-session php8-curl bash
       - name: Install pecl
         continue-on-error: true
         run: pecl install vld-beta
       - name: Build SP and run the testsuite
-        continue-on-error: true
         run: |
           make release
           ln -s $(php -r 'echo ini_get("extension_dir");')/* src/modules/
           make tests
       - name: Show logs in case of failure
         if: ${{ failure() }}
-        continue-on-error: true
         run: |
           grep -r . --include='*.log' src/tests
-- 
cgit v1.3


From 68944ff47089f509d6c7fde1bd98cd8c935acdf6 Mon Sep 17 00:00:00 2001
From: Ben Fuhrmannek
Date: Wed, 12 Jan 2022 21:07:57 +0100
Subject: add grep to alpine test container

---
 .github/workflows/distributions.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to '.github/workflows')

diff --git a/.github/workflows/distributions.yml b/.github/workflows/distributions.yml
index 79ae9b5..9c19f39 100644
--- a/.github/workflows/distributions.yml
+++ b/.github/workflows/distributions.yml
@@ -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 /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
+        run: apk add php7-dev php7-cgi php7-simplexml php7-xml pcre-dev build-base php7-pear php7-openssl php7-session bash grep
       - name: Install pecl
         continue-on-error: true
         run: pecl install vld-beta
@@ -125,7 +125,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
+        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
       - name: Install pecl
         continue-on-error: true
         run: pecl install vld-beta
-- 
cgit v1.3