From bca2290b4c91b7c2f41767c9ec50093b94d28a51 Mon Sep 17 00:00:00 2001
From: Hans Zandbelt <hans.zandbelt@openidc.com>
Date: Thu, 6 Jun 2024 15:27:26 +0200
Subject: [PATCH] use matrix of NGINX versions in build/archs; fix memcached

use ubuntu-latest

Signed-off-by: Hans Zandbelt <hans.zandbelt@openidc.com>
---
 .github/workflows/archs.yml | 25 +++++++++++++++----------
 .github/workflows/build.yml | 15 ++++++++++-----
 2 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/archs.yml b/.github/workflows/archs.yml
index 44d4602..bebfcda 100644
--- a/.github/workflows/archs.yml
+++ b/.github/workflows/archs.yml
@@ -9,8 +9,8 @@ on:
 jobs:
   build:
 
-    runs-on: ubuntu-22.04
-    name: ${{ matrix.arch }}
+    runs-on: ubuntu-latest
+    name: ${{ matrix.arch }}-${{ matrix.nginx_version }}
 
     strategy:
       matrix:
@@ -18,14 +18,18 @@ jobs:
 #test/check_cache.c:74:F:core:test_cache_redis:0: Assertion 'value == ((void *)0)' failed: value == 0x4006a290, ((void *)0) == 0
 #test/check_nginx.c:106:E:core:test_request_context:0: (after this point) Received signal 11 (Segmentation fault)
 #test/check_nginx.c:118:E:core:test_nginx_http_response_set:0: (after this point) Received signal 11 (Segmentation fault)  
-#          - arch: armv7
-#            distro: ubuntu22.04
+          - arch: armv7
+            distro: ubuntu-latest
+            nginx_version: 1.24.0
           - arch: aarch64
-            distro: ubuntu22.04
+            distro: ubuntu-latest
+            nginx_version: 1.24.0
           - arch: ppc64le
-            distro: ubuntu22.04
+            distro: ubuntu-latest
+            nginx_version: 1.24.0
           - arch: s390x
-            distro: ubuntu22.04
+            distro: ubuntu-latest
+            nginx_version: 1.24.0
   
     steps:
     - uses: actions/checkout@v4
@@ -41,11 +45,12 @@ jobs:
           apt-get install -y libjansson-dev libcurl4-openssl-dev libhiredis-dev libmemcached-dev redis-server memcached libpcre2-dev libpcre2-8-0
           apt-get install -y build-essential libpcre3 libpcre3-dev zlib1g zlib1g-dev libxml2 libxml2-dev uuid-dev
           cd /tmp
-          wget --no-check-certificate https://nginx.org/download/nginx-1.18.0.tar.gz
-          tar zxvf nginx-1.18.0.tar.gz
-          ln -s nginx-1.18.0 nginx
+          wget --no-check-certificate https://nginx.org/download/nginx-${{ matrix.nginx_version }}.tar.gz
+          tar zxvf nginx-${{ matrix.nginx_version }}.tar.gz
+          ln -s nginx-${{ matrix.nginx_version }} nginx
           cd /tmp/nginx && ./configure --with-debug
         run: |
           ./autogen.sh
           ./configure --with-nginx=/tmp/nginx
+          sed -i "s/-l/#-l/g" /etc/memcached.conf
           service memcached start && service redis-server start && make check || (cat test-suite.log && exit -1)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index cf0e8f5..73e9413 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -3,8 +3,15 @@ name: Build
 on: [push, pull_request]
 
 jobs:
+
   build:
+  
     runs-on: ubuntu-latest
+    name: ${{ matrix.nginx_version }}
+
+    strategy:
+      matrix:
+        nginx_version: [1.18.0, 1.24.0, 1.26.0, 1.27.0]
 
     services:
 
@@ -27,17 +34,15 @@ jobs:
     - uses: actions/checkout@v4
 
     - name: Dependencies
-      env:
-        NGINX_VERSION: 1.18.0
       run: |
         sudo apt-get update -y
         sudo apt-get install -y apache2-dev libcjose-dev libssl-dev check pkg-config
         sudo apt-get install -y libjansson-dev libcurl4-openssl-dev libhiredis-dev libmemcached-dev libpcre2-dev libpcre2-8-0
         sudo apt-get install build-essential libpcre3 libpcre3-dev zlib1g zlib1g-dev libxml2 libxml2-dev uuid-dev
         cd /tmp
-        wget https://nginx.org/download/nginx-${NGINX_VERSION}.tar.gz
-        tar zxvf nginx-${NGINX_VERSION}.tar.gz
-        ln -s nginx-${NGINX_VERSION} nginx
+        wget https://nginx.org/download/nginx-${{ matrix.nginx_version }}.tar.gz
+        tar zxvf nginx-${{ matrix.nginx_version }}.tar.gz
+        ln -s nginx-${{ matrix.nginx_version }} nginx
         cd /tmp/nginx && ./configure --with-debug
         
     - name: Configure