From d68b0df805c591ca6da814cf53855ca5334cffb3 Mon Sep 17 00:00:00 2001
From: Joanhey <joanhey@kumbiaphp.com>
Date: Thu, 30 Nov 2023 19:30:56 +0100
Subject: [PATCH] Fix tests

---
 .github/workflows/build.yml                   |  6 +-
 .github/workflows/build_22.04.yml             | 68 +++++++++++++++++++
 .github/workflows/build_22.04_compile_php.yml | 39 -----------
 3 files changed, 71 insertions(+), 42 deletions(-)
 create mode 100644 .github/workflows/build_22.04.yml
 delete mode 100644 .github/workflows/build_22.04_compile_php.yml

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ee00aa03..6b4fddff 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -23,8 +23,8 @@ env:
 jobs:
   build_php_22-04:
     name: Compile PHP Ubuntu 22.04
-    if: ${{ contains(github.event.head_commit.message, '<compile') }}
-    uses: ./.github/workflows/build_22.04_compile_php.yml
+    if: ${{ !contains(github.event.head_commit.message, '<compile') }}
+    uses: ./.github/workflows/build_22.04.yml
 
   build_20-04:
     name: Ubuntu 20.04
@@ -38,6 +38,6 @@ jobs:
 
   build_dynamic_22-04:
     name: Ubuntu 22.04 dynamic
-    if: ${{ !contains(github.event.head_commit.message, '<22') }}
+    if: ${{ contains(github.event.head_commit.message, '<22') }}
     uses: ./.github/workflows/build_22.04_dynamic.yml
 
diff --git a/.github/workflows/build_22.04.yml b/.github/workflows/build_22.04.yml
new file mode 100644
index 00000000..68e4a9f7
--- /dev/null
+++ b/.github/workflows/build_22.04.yml
@@ -0,0 +1,68 @@
+name: 22.04 Ngx-php & PHP build test
+
+on:
+  workflow_call:
+
+env:
+  DB_DATABASE: ngx_php
+  DB_USER: ngx_php
+  DB_PASSWORD: ngx_php
+
+jobs:
+  build:
+    runs-on: ubuntu-20.04
+
+    strategy:
+      matrix:
+        php_version: ["7.0", "7.1", "7.2", "7.3", "7.4", "8.0", "8.1", "8.2", "8.3"]
+        ngxinx_version: ["1.20.2", "1.22.1", "1.24.0"] # "1.12.2" fail to compile
+        # Disable fail-fast to allow all failing versions to fail in a
+        # single build, rather than stopping when the first one fails.
+      fail-fast: false
+
+    name: PHP-${{ matrix.php_version }} Nginx ${{ matrix.ngxinx_version }}
+
+    steps:
+      - uses: actions/checkout@v3
+      - name: Install dependencies
+        run: sudo apt-get install -yqq cpanminus libxml2-dev systemtap-sdt-dev zlib1g-dev libpcre3-dev libargon2-0-dev libsodium-dev
+
+      - name: Setup PHP-${{ matrix.php_version }}
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php_version }}
+          extensions: dev, embed, opcache, mysql
+          ini-values: opcache.enable=1, opcache.enable_cli=1, opcache.jit=tracing, opcache.jit_buffer_size=128M,error_reporting=E_ALL
+          coverage: none
+
+      - name: Download Nginx v${{ matrix.ngxinx_version }}
+        run: |
+          wget http://nginx.org/download/nginx-${{ matrix.ngxinx_version }}.tar.gz
+          tar -zxf nginx-${{ matrix.ngxinx_version }}.tar.gz
+
+      - name: Compile Ngx-php
+        env:
+          PHP_SRC_VERSION: ${{ matrix.php_version }}
+          NGINX_SRC_VERSION: ${{ matrix.ngxinx_version }}
+        run: ./.github/ngx-php/compile-ngx.sh
+
+      - name: MySQL Start and create table
+        run: |
+          sudo systemctl start mysql.service
+          mysql -uroot -proot -e 'CREATE DATABASE ${{ env.DB_DATABASE }};'
+          mysql -uroot -proot < .github/ngx-php/world.sql
+
+      - name: Install Redis & Memcached
+        run: |
+          sudo apt-get install -y redis-server redis-tools memcached
+          sudo redis-server /etc/redis/redis.conf
+
+      - name: Perl packages
+        run: sudo cpanm -n Test::Nginx
+
+      - name: Test
+        env:
+          PHP_SRC_VERSION: ${{ matrix.php_version }}
+        run: |
+          sudo sed -i "s|opcache.jit=off|opcache.jit=tracing|g" /etc/php/${PHP_SRC_VERSION}/embed/conf.d/10-opcache.ini
+          ./.github/ngx-php/test.sh
diff --git a/.github/workflows/build_22.04_compile_php.yml b/.github/workflows/build_22.04_compile_php.yml
deleted file mode 100644
index 1ffa6528..00000000
--- a/.github/workflows/build_22.04_compile_php.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-name: 22.04 Ngx-php & PHP build test
-on:
-  workflow_call:
-
-env:
-  DB_DATABASE: ngx_php
-  DB_USER: root
-  DB_PASSWORD: root
-
-jobs:
-  build:
-    runs-on: ubuntu-22.04
-    strategy:
-      matrix:
-        php_version: ["8.1.17"] #[7.0.33, 7.1.33, 7.2.34, 7.3.33, 7.4.26, 8.0.28, 8.1.17]
-        ngxinx_version: ["1.22.1"] #[1.12.2, 1.20.2, 1.22.1, 1.24.0]
-    steps:
-    - uses: actions/checkout@v3
-    - name: prepare basic packages
-      run: | 
-        sudo apt-get install -yqq locales language-pack-de re2c libgmp-dev libicu-dev libmcrypt-dev libtidy-dev libaspell-dev libpspell-dev librecode-dev libsasl2-dev libxpm-dev cpanminus openssl libssl-dev libbz2-dev libzip-dev systemtap-sdt-dev libonig-dev axel libcurl3-dev zlib1g-dev libpcre3-dev libargon2-0-dev libsodium-dev
-        sudo apt-get install -y redis-server redis-tools memcached
-        sudo redis-server /etc/redis/redis.conf
-
-    - name: compiler
-      env:
-          PHP_SRC_VERSION: ${{ matrix.php_version }}
-          NGINX_SRC_VERSION: ${{ matrix.ngxinx_version }}
-      run: |
-        sudo /etc/init.d/mysql start
-        mysql -e 'CREATE DATABASE ${{ env.DB_DATABASE }};' -u${{ env.DB_USER }} -p${{ env.DB_PASSWORD }}
-        mysql -u${{ env.DB_USER }} -p${{ env.DB_PASSWORD }} < .github/ngx-php/world.sql
-        ./.github/ngx-php/compiler.sh
-    
-    - name: perl packages 
-      run: sudo cpanm -n Test::Nginx
-      
-    - name: test
-      run: ./.github/ngx-php/test.sh
\ No newline at end of file