From f52f8cc6850ac7ae9fdef90b5ce2bc9015408157 Mon Sep 17 00:00:00 2001 From: Joanhey Date: Sun, 19 May 2024 23:41:18 +0200 Subject: [PATCH] Fix JIT --- .github/workflows/build_20.04.yml | 4 ++-- .github/workflows/build_20.04_dynamic.yml | 16 ++++++++-------- .github/workflows/build_22.04.yml | 4 ++-- .github/workflows/build_22.04_dynamic.yml | 4 ++-- .github/workflows/build_24.04.yml | 4 ++-- .github/workflows/build_24.04_dynamic.yml | 4 ++-- .github/workflows/build_development.yml | 2 +- 7 files changed, 19 insertions(+), 19 deletions(-) diff --git a/.github/workflows/build_20.04.yml b/.github/workflows/build_20.04.yml index d39b7124..8d104e81 100644 --- 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: @@ -64,5 +64,5 @@ jobs: env: PHP_SRC_VERSION: ${{ matrix.php_version }} run: | - echo opcache.jit=tracing | sudo tee --append /etc/php/${PHP_SRC_VERSION}/embed/conf.d/10-opcache.ini + echo 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 index 79f3f9bd..d96cf7cc 100644 --- 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,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: Dynamic PHP-${{ matrix.php_version }} Nginx ${{ matrix.ngxinx_version }} + name: Dynamic 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 }} 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 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 index 33b52751..f3d0e8d6 100644 --- 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: @@ -67,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 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 index be650f3c..879ad5eb 100644 --- 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: @@ -66,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 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 index f2e80f9f..896e91a5 100644 --- a/.github/workflows/build_24.04.yml +++ b/.github/workflows/build_24.04.yml @@ -1,4 +1,4 @@ -name: 24.04 Ngx-php & PHP build test +name: Build 24.04 on: workflow_call: @@ -66,5 +66,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 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_dynamic.yml b/.github/workflows/build_24.04_dynamic.yml index 551e6e2f..d83be693 100644 --- a/.github/workflows/build_24.04_dynamic.yml +++ b/.github/workflows/build_24.04_dynamic.yml @@ -1,4 +1,4 @@ -name: Build dynamic test Ubuntu 24.04 +name: Build dynamic 24.04 on: workflow_call: @@ -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 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_development.yml b/.github/workflows/build_development.yml index 893fc1bc..151af1bf 100644 --- a/.github/workflows/build_development.yml +++ b/.github/workflows/build_development.yml @@ -84,5 +84,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 echo "opcache.jit=tracing" >> /etc/php/${PHP_SRC_VERSION}/embed/conf.d/10-opcache.ini ./.github/ngx-php/test.sh