From 8f7178f1a825e646df564ed225ff3a18d28d479d Mon Sep 17 00:00:00 2001
From: Riccardo Magliocchetti <riccardo.magliocchetti@gmail.com>
Date: Sun, 17 Sep 2023 16:23:17 +0200
Subject: [PATCH] ci: run compile test on ubuntu 22.04 too

---
 .github/workflows/compile-test.yml | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/compile-test.yml b/.github/workflows/compile-test.yml
index 9d9c564fd..2a05e3495 100644
--- a/.github/workflows/compile-test.yml
+++ b/.github/workflows/compile-test.yml
@@ -8,22 +8,31 @@ on:
 
 jobs:
   build:
+    strategy:
+      matrix:
+        include:
+          - os: ubuntu-20.04
+            php: "php7.4"
+            php-config: "php-config7.4"
+          - os: ubuntu-22.04
+            php: "php8.1"
+            php-config: "php-config8.1"
 
-    runs-on: ubuntu-20.04
+    runs-on: ${{ matrix.os }}
 
     steps:
     - name: remove sury php ppa that does not ship libphpX.Y-embed
       run: |
         sudo add-apt-repository --remove ppa:ondrej/php
-        sudo apt remove php7.4-dev php7.4 php7.4-common
+        sudo apt remove ${{ matrix.php }}-dev ${{ matrix.php }} ${{ matrix.php }}-common
     - name: Install dependencies
       run: |
         sudo apt update -qq
-        sudo apt install --no-install-recommends -qqyf python3.8-dev \
+        sudo apt install --no-install-recommends -qqyf python3-dev \
           libxml2-dev libpcre3-dev libcap2-dev \
           libargon2-0-dev libsodium-dev \
-          php7.4-dev libphp7.4-embed \
-          liblua5.1-0-dev ruby2.7-dev \
+          ${{ matrix.php }}-dev lib${{ matrix.php }}-embed \
+          liblua5.1-0-dev ruby-dev \
           libjansson-dev libldap2-dev libpq-dev \
           libpam0g-dev libsqlite3-dev libyaml-dev \
           libzmq3-dev libmatheval-dev libperl-dev \
@@ -37,7 +46,7 @@ jobs:
           curl check
     - uses: actions/checkout@v2
     - name: Build kitchensink uWSGI binary
-      run: UWSGICONFIG_PHPPATH=php-config7.4 /usr/bin/python3 uwsgiconfig.py --build travis
+      run: UWSGICONFIG_PHPPATH=${{ matrix.php-config }} /usr/bin/python3 uwsgiconfig.py --build travis
     - name: Build uWSGI binary
       run: |
         /usr/bin/python3 uwsgiconfig.py --build base