Merge pull request #186 from joanhey/fix-major-version

Fix php 8 major version
rryqszq4 · Feb 18, 2024 · 2eb6241 · 2eb6241
2 parents f30f254 + 826ca8f
commit 2eb6241
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/.github/ngx-php/test.sh b/.github/ngx-php/test.sh
@@ -26,7 +26,7 @@ ${NGX_PATH}/nginx -V
 export PATH=${NGX_PATH}:$PATH
 NGX_MODULE_PATH=`pwd`'/nginx/modules'
 if [ -d "${NGX_MODULE_PATH}" ]; then
-  for file in `\find ${NGX_MODULE_PATH} -name '*.so'`; do
+  for file in `\find ${NGX_MODULE_PATH} -name '*.so' | sort -h | xargs find`; do
     TEST_NGINX_LOAD_MODULES="${TEST_NGINX_LOAD_MODULES}${file} "
   done
   export TEST_NGINX_LOAD_MODULES

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -7,12 +7,14 @@ on:
       - "t/**"
       - "third_party/**"
       - ".github/**"
+      - "config"
   pull_request:
     paths:
       - "src/**"
       - "t/**"
       - "third_party/**"
       - ".github/**"
+      - "config"
 
 # later try to pass it, and not repeat it in workflows 
 env:

diff --git a/config b/config
@@ -65,8 +65,8 @@ if [ -z "$NGX_PHP_INCS" ]; then
 fi
 
 if [ -z "$NGX_PHP_LIBS" ]; then
-  PHP_VERSION="`$PHP_CONFIG --version`"
-  PHP_MAJOR_VERSION=`echo $PHP_VERSION | sed -e "s#\.[0-9]*##g"`
+  PHP_VERSION="`$PHP_CONFIG --vernum`"
+  PHP_MAJOR_VERSION=`echo $PHP_VERSION | cut -b 1`
   if [ $PHP_MAJOR_VERSION -ge "8" ]; then
     PHP_MAJOR_VERSION=""
   fi

diff --git a/t/025-opcache.t b/t/025-opcache.t
@@ -1,7 +1,7 @@
 
 # vim:set ft= ts=4 sw=4 et fdm=marker:
 
-use Test::Nginx::Socket 'no_plan';
+use Test::Nginx::Socket skip_all => "Skip";
 
 $ENV{'TEST_NGINX_BUILD_DIR'} = $ENV{'TRAVIS_BUILD_DIR'};
 
@@ -36,8 +36,6 @@ location = /jit {
             # JIT only added in PHP8
             echo "JIT enabled\n";
         } else {
-            # set at runtime, as is not enabled from php.ini
-            # ini_set("opcache.jit", "tracing");
             echo opcache_get_status()["jit"]["enabled"] ? "JIT enabled\n" : "JIT disabled";
         }
     ';
@@ -48,7 +46,6 @@ GET /jit
 JIT enabled
 
 
-
 === TEST 3: JIT ini values
 show .ini valude
 --- http_config