Add Ubuntu 24.04 to tests

rryqszq4 · May 19, 2024 · eef415b · eef415b
1 parent 8e622c1
commit eef415b
Show file tree

Hide file tree

Showing 8 changed files with 187 additions and 33 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -23,7 +23,12 @@ env:
   DB_PASSWORD: ngx_php
 
 jobs:
-  build_php_22-04:
+  build_24-04:
+    name: Compile PHP Ubuntu 24.04
+    if: ${{ !contains(github.event.head_commit.message, '<compile') }}
+    uses: ./.github/workflows/build_24.04.yml
+
+  build_22-04:
     name: Compile PHP Ubuntu 22.04
     if: ${{ !contains(github.event.head_commit.message, '<compile') }}
     uses: ./.github/workflows/build_22.04.yml
@@ -32,14 +37,20 @@ jobs:
     name: Ubuntu 20.04
     if: ${{ !contains(github.event.head_commit.message, '<20') }}
     uses: ./.github/workflows/build_20.04.yml
-
-  build_dynamic_20-04:
-    name: Ubuntu 20.04 dynamic
-    if: ${{ !contains(github.event.head_commit.message, '<20') }}
-    uses: ./.github/workflows/build_20.04_dynamic.yml
+
+  # Dinamyc build
+  build_dynamic_24-04:
+    name: Ubuntu 24.04 dynamic
+    if: ${{ !contains(github.event.head_commit.message, '<24') }}
+    uses: ./.github/workflows/build_24.04_dynamic.yml
 
   build_dynamic_22-04:
     name: Ubuntu 22.04 dynamic
     if: ${{ !contains(github.event.head_commit.message, '<22') }}
     uses: ./.github/workflows/build_22.04_dynamic.yml
 
+  build_dynamic_20-04:
+    name: Ubuntu 20.04 dynamic
+    if: ${{ !contains(github.event.head_commit.message, '<20') }}
+    uses: ./.github/workflows/build_20.04_dynamic.yml
+
diff --git a/.github/workflows/build_20.04.yml b/.github/workflows/build_20.04.yml
@@ -15,12 +15,12 @@ jobs:
     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.25.4"] # "1.12.2" fail to compile
+        nginx_version: ["1.20.2", "1.22.1", "1.24.0", "1.25.4"] # "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 }}
+    name: PHP-${{ matrix.php_version }} Nginx ${{ matrix.nginx_version }}
 
     steps:
       - uses: actions/checkout@v4
@@ -35,15 +35,15 @@ jobs:
           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 }}
+      - name: Download Nginx v${{ matrix.nginx_version }}
         run: |
-          wget http://nginx.org/download/nginx-${{ matrix.ngxinx_version }}.tar.gz
-          tar -zxf nginx-${{ matrix.ngxinx_version }}.tar.gz
+          wget http://nginx.org/download/nginx-${{ matrix.nginx_version }}.tar.gz
+          tar -zxf nginx-${{ matrix.nginx_version }}.tar.gz
 
       - name: Compile Ngx-php
         env:
           PHP_SRC_VERSION: ${{ matrix.php_version }}
-          NGINX_SRC_VERSION: ${{ matrix.ngxinx_version }}
+          NGINX_SRC_VERSION: ${{ matrix.nginx_version }}
         run: ./.github/ngx-php/compile-ngx.sh
 
       - name: MySQL Start and create table

diff --git a/.github/workflows/build_22.04.yml b/.github/workflows/build_22.04.yml
@@ -15,12 +15,13 @@ jobs:
     strategy:
       matrix:
         php_version: ["8.1", "8.2", "8.3"]
-        ngxinx_version: ["1.24.0", "1.25.4"]
+        # Only nginx stable and mainline versions for faster tests
+        nginx_version: ["1.25.5", "1.26.0"]
         # 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 }}
+    name: PHP-${{ matrix.php_version }} Nginx ${{ matrix.nginx_version }}
 
     steps:
       - uses: actions/checkout@v4
@@ -35,15 +36,15 @@ jobs:
           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 }}
+      - name: Download Nginx v${{ matrix.nginx_version }}
         run: |
-          wget http://nginx.org/download/nginx-${{ matrix.ngxinx_version }}.tar.gz
-          tar -zxf nginx-${{ matrix.ngxinx_version }}.tar.gz
+          wget http://nginx.org/download/nginx-${{ matrix.nginx_version }}.tar.gz
+          tar -zxf nginx-${{ matrix.nginx_version }}.tar.gz
 
       - name: Compile Ngx-php
         env:
           PHP_SRC_VERSION: ${{ matrix.php_version }}
-          NGINX_SRC_VERSION: ${{ matrix.ngxinx_version }}
+          NGINX_SRC_VERSION: ${{ matrix.nginx_version }}
         run: ./.github/ngx-php/compile-ngx.sh
 
       - name: MySQL Start and create table

diff --git a/.github/workflows/build_22.04_dynamic.yml b/.github/workflows/build_22.04_dynamic.yml
@@ -15,12 +15,13 @@ jobs:
     strategy:
       matrix:
         php_version: ["8.1", "8.2", "8.3"] # "7.0", "7.1", "7.2", "7.3", 
-        ngxinx_version: ["1.24.0", "1.25.4"]
+        # Only nginx stable and mainline versions for faster tests
+        nginx_version: ["1.25.5", "1.26.0"]
         # 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: 22.04 Dynamic PHP-${{ matrix.php_version }} Nginx ${{ matrix.ngxinx_version }}
+    name: 22.04 Dynamic PHP-${{ matrix.php_version }} Nginx ${{ matrix.nginx_version }}
 
     steps:
       - uses: actions/checkout@v4
@@ -35,15 +36,15 @@ jobs:
           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 }}
+      - name: Download Nginx v${{ matrix.nginx_version }}
         run: |
-          wget http://nginx.org/download/nginx-${{ matrix.ngxinx_version }}.tar.gz
-          tar -zxf nginx-${{ matrix.ngxinx_version }}.tar.gz
+          wget http://nginx.org/download/nginx-${{ matrix.nginx_version }}.tar.gz
+          tar -zxf nginx-${{ matrix.nginx_version }}.tar.gz
 
       - name: Compile Ngx-php
         env:
           PHP_SRC_VERSION: ${{ matrix.php_version }}
-          NGINX_SRC_VERSION: ${{ matrix.ngxinx_version }}
+          NGINX_SRC_VERSION: ${{ matrix.nginx_version }}
           NGINX_MODULE: "DYNAMIC"
         run: ./.github/ngx-php/compile-ngx.sh
 

diff --git a/.github/workflows/build_24.04.yml b/.github/workflows/build_24.04.yml
@@ -0,0 +1,71 @@
+name: 24.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-24.04
+
+    strategy:
+      matrix:
+        php_version: ["8.1", "8.2", "8.3"]
+        # Only nginx stable and mainline versions for faster tests
+        nginx_version: ["1.25.5", "1.26.0"]
+        # 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.nginx_version }}
+
+    steps:
+      - uses: actions/checkout@v4
+      - name: Install dependencies
+        run: sudo apt-get install -yqq cpanminus libxml2-dev systemtap-sdt-dev zlib1g-dev libpcre3-dev libargon2-0-dev libsodium-dev libkrb5-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.nginx_version }}
+        run: |
+          wget http://nginx.org/download/nginx-${{ matrix.nginx_version }}.tar.gz
+          tar -zxf nginx-${{ matrix.nginx_version }}.tar.gz
+
+      - name: Compile Ngx-php
+        env:
+          PHP_SRC_VERSION: ${{ matrix.php_version }}
+          NGINX_SRC_VERSION: ${{ matrix.nginx_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 cp .github/ngx-php/php/99-xdebug.ini /etc/php/${PHP_SRC_VERSION}/embed/conf.d/
+          sudo cp .github/ngx-php/php/99-xdebug.ini /etc/php/${PHP_SRC_VERSION}/cli/conf.d/
+          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_24.04_dynamic.yml b/.github/workflows/build_24.04_dynamic.yml
@@ -0,0 +1,70 @@
+name: Build dynamic test Ubuntu 24.04
+
+on:
+  workflow_call:
+
+env:
+  DB_DATABASE: ngx_php
+  DB_USER: ngx_php
+  DB_PASSWORD: ngx_php
+
+jobs:
+  build:
+    runs-on: ubuntu-24.04
+
+    strategy:
+      matrix:
+        php_version: ["8.1", "8.2", "8.3"] # "7.0", "7.1", "7.2", "7.3", 
+        # Only nginx stable and mainline versions for faster tests
+        nginx_version: ["1.25.5", "1.26.0"]
+        # 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: 22.04 Dynamic PHP-${{ matrix.php_version }} Nginx ${{ matrix.nginx_version }}
+
+    steps:
+      - uses: actions/checkout@v4
+      - name: Install dependencies
+        run: sudo apt-get install -yqq cpanminus libxml2-dev systemtap-sdt-dev zlib1g-dev libpcre3-dev libargon2-0-dev libsodium-dev libkrb5-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.nginx_version }}
+        run: |
+          wget http://nginx.org/download/nginx-${{ matrix.nginx_version }}.tar.gz
+          tar -zxf nginx-${{ matrix.nginx_version }}.tar.gz
+
+      - name: Compile Ngx-php
+        env:
+          PHP_SRC_VERSION: ${{ matrix.php_version }}
+          NGINX_SRC_VERSION: ${{ matrix.nginx_version }}
+          NGINX_MODULE: "DYNAMIC"
+        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_development.yml b/.github/workflows/build_development.yml
@@ -27,17 +27,17 @@ env:
 
 jobs:
   build:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     strategy:
       matrix:
         php_version: ["8.3"]
-        ngxinx_version: ["1.25.4"] # "1.12.2" fail to compile
+        nginx_version: ["1.26.0"] 
         # 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 }}
+    name: PHP-${{ matrix.php_version }} Nginx ${{ matrix.nginx_version }}
 
     steps:
       - uses: actions/checkout@v4
@@ -52,15 +52,15 @@ jobs:
           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 }}
+      - name: Download Nginx v${{ matrix.nginx_version }}
         run: |
-          wget http://nginx.org/download/nginx-${{ matrix.ngxinx_version }}.tar.gz
-          tar -zxf nginx-${{ matrix.ngxinx_version }}.tar.gz
+          wget http://nginx.org/download/nginx-${{ matrix.nginx_version }}.tar.gz
+          tar -zxf nginx-${{ matrix.nginx_version }}.tar.gz
 
       - name: Compile Ngx-php
         env:
           PHP_SRC_VERSION: ${{ matrix.php_version }}
-          NGINX_SRC_VERSION: ${{ matrix.ngxinx_version }}
+          NGINX_SRC_VERSION: ${{ matrix.nginx_version }}
         run: ./.github/ngx-php/compile-ngx.sh
 
       - name: MySQL Start and create table

diff --git a/README.md b/README.md
@@ -38,8 +38,8 @@ What's different with official php
 Requirement
 -----------
 - Linux only
-- PHP-7.* ~ PHP-8.1
-- nginx-1.4.7 ~ nginx-1.23.x
+- PHP-7.* ~ PHP-8.3
+- nginx-1.4.7 ~ nginx-1.26.x
 
 Installation
 ------------