[src] git merge from development

rryqszq4 · Jan 12, 2025 · fc298bb · fc298bb
2 parents e383776 + c5985f5
commit fc298bb
Show file tree

Hide file tree

Showing 13 changed files with 228 additions and 115 deletions.
diff --git a/.github/ngx-php/compile-ngx.sh b/.github/ngx-php/compile-ngx.sh
@@ -9,10 +9,9 @@
 # mkdir php
 # mkdir nginx
 
-if [ ${PHP_SRC_VERSION:0:1} -ge "8" ]; then
-   PHP_MAJOR_VERSION=""
-else
-   PHP_MAJOR_VERSION=${PHP_SRC_VERSION:0:1}
+PHP_MAJOR_VERSION=${PHP_SRC_VERSION:0:1}
+if [ $PHP_MAJOR_VERSION -ge "8" ]; then
+    PHP_MAJOR_VERSION=""
 fi
 
 # echo "nginx download ..."

diff --git a/.github/ngx-php/compiler.sh b/.github/ngx-php/compiler.sh
@@ -11,10 +11,10 @@ mkdir nginx
 
 echo "php download ..."
 wget http://php.net/distributions/php-${PHP_SRC_VERSION}.tar.gz
-if [ ${PHP_SRC_VERSION:0:1} -ge "8" ]; then
-  PHP_MAJOR_VERSION=""
-else
-  PHP_MAJOR_VERSION=${PHP_SRC_VERSION:0:1}
+
+PHP_MAJOR_VERSION=${PHP_SRC_VERSION:0:1}
+if [ $PHP_MAJOR_VERSION -ge "8" ]; then
+    PHP_MAJOR_VERSION=""
 fi
 echo "php download ... done"
 

diff --git a/.github/ngx-php/test.sh b/.github/ngx-php/test.sh
@@ -35,4 +35,6 @@ fi
 export TRAVIS_BUILD_DIR=`pwd`
 echo $TRAVIS_BUILD_DIR
 
+killall nginx
+
 prove -r t
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -23,23 +23,34 @@ env:
   DB_PASSWORD: ngx_php
 
 jobs:
-  build_php_22-04:
-    name: Compile PHP Ubuntu 22.04
-    if: ${{ contains(github.event.head_commit.message, '<compile') }}
+  build_24-04:
+    name: Ubuntu 24.04
+    if: ${{ !contains(github.event.head_commit.message, '<compile') }}
+    uses: ./.github/workflows/build_24.04.yml
+
+  build_22-04:
+    name: Ubuntu 22.04
+    if: ${{ !contains(github.event.head_commit.message, '<compile') }}
     uses: ./.github/workflows/build_22.04.yml
 
   build_20-04:
     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') }}
+    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
@@ -1,4 +1,4 @@
-name: Build test 20.04
+name: Build 20.04
 
 on:
   workflow_call:
@@ -15,15 +15,15 @@ jobs:
     strategy:
       matrix:
         php_version: ["7.0", "7.1", "7.2", "7.3", "7.4", "8.0", "8.1", "8.2", "8.3", "8.4"]
-        ngxinx_version: ["1.20.2", "1.22.1", "1.24.0"] # "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@v3
+      - 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
 
@@ -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
@@ -64,5 +64,5 @@ jobs:
         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
+          sudo bash -c "echo "opcache.jit=tracing" >> /etc/php/${PHP_SRC_VERSION}/embed/conf.d/10-opcache.ini"
           ./.github/ngx-php/test.sh
diff --git a/.github/workflows/build_20.04_dynamic.yml b/.github/workflows/build_20.04_dynamic.yml
@@ -1,4 +1,4 @@
-name: Build dynamic test 20.04
+name: Build dynamic 20.04
 
 on:
   workflow_call:
@@ -15,15 +15,15 @@ jobs:
     strategy:
       matrix:
         php_version: ["7.0", "7.1", "7.2", "7.3", "7.4", "8.0", "8.1", "8.2", "8.3", "8.4"]
-        ngxinx_version: ["1.20.2", "1.22.1", "1.24.0"] # "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: Dynamic PHP-${{ matrix.php_version }} Nginx ${{ matrix.ngxinx_version }}
+    name: Dynamic PHP-${{ matrix.php_version }} Nginx ${{ matrix.nginx_version }}
 
     steps:
-      - uses: actions/checkout@v3
+      - 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
 
@@ -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 }}
           NGINX_MODULE: "DYNAMIC"
         run: ./.github/ngx-php/compile-ngx.sh
 
@@ -65,5 +65,5 @@ jobs:
         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
+          sudo bash -c "echo "opcache.jit=tracing" >> /etc/php/${PHP_SRC_VERSION}/embed/conf.d/10-opcache.ini"
           ./.github/ngx-php/test.sh
diff --git a/.github/workflows/build_22.04.yml b/.github/workflows/build_22.04.yml
@@ -1,4 +1,4 @@
-name: 22.04 Ngx-php & PHP build test
+name: Build 22.04
 
 on:
   workflow_call:
@@ -15,15 +15,16 @@ jobs:
     strategy:
       matrix:
         php_version: ["7.0", "7.1", "7.2", "7.3", "7.4", "8.0", "8.1", "8.2", "8.3", "8.4"]
-        ngxinx_version: ["1.20.2", "1.22.1", "1.24.0"] # "1.12.2" fail to compile
+        # Only nginx stable and mainline versions for faster tests
+        nginx_version: [ "1.25.5", "1.26.0", "1.27.3" ]
         # 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@v3
+      - 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
 
@@ -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
@@ -66,5 +67,5 @@ jobs:
         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
+          sudo bash -c "echo "opcache.jit=tracing" >> /etc/php/${PHP_SRC_VERSION}/embed/conf.d/10-opcache.ini"
           ./.github/ngx-php/test.sh
diff --git a/.github/workflows/build_22.04_dynamic.yml b/.github/workflows/build_22.04_dynamic.yml
@@ -1,4 +1,4 @@
-name: Build dynamic test Ubuntu 22.04
+name: Build dynamic 22.04
 
 on:
   workflow_call:
@@ -15,15 +15,16 @@ jobs:
     strategy:
       matrix:
         php_version: ["7.4", "8.0", "8.1", "8.2", "8.3", "8.4"] # "7.0", "7.1", "7.2", "7.3",
-        ngxinx_version: ["1.20.2", "1.22.1", "1.24.0"] # "1.12.2" fail to compile
+        # Only nginx stable and mainline versions for faster tests
+        nginx_version: [ "1.25.5", "1.26.0", "1.27.3" ]
         # 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: Dynamic PHP-${{ matrix.php_version }} Nginx ${{ matrix.nginx_version }}
 
     steps:
-      - uses: actions/checkout@v3
+      - 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
 
@@ -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
 
@@ -65,5 +66,5 @@ jobs:
         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
+          sudo bash -c "echo "opcache.jit=tracing" >> /etc/php/${PHP_SRC_VERSION}/embed/conf.d/10-opcache.ini"
           ./.github/ngx-php/test.sh
diff --git a/.github/workflows/build_24.04.yml b/.github/workflows/build_24.04.yml
@@ -0,0 +1,70 @@
+name: Build 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.2", "8.3"]
+        # Only nginx stable and mainline versions for faster tests
+        nginx_version: ["1.25.5", "1.26.0", "1.27.3"]
+        # 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-dev libsodium-dev libkrb5-dev redis-server redis-tools memcached
+
+      - 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 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 bash -c "echo "opcache.jit=tracing" >> /etc/php/${PHP_SRC_VERSION}/embed/conf.d/10-opcache.ini"
+          ./.github/ngx-php/test.sh