From eef415b5580f29282aba9ed9e79fd3b4d7c402d9 Mon Sep 17 00:00:00 2001 From: Joanhey Date: Sun, 19 May 2024 15:19:20 +0200 Subject: [PATCH 01/15] Add Ubuntu 24.04 to tests --- .github/workflows/build.yml | 23 ++++++-- .github/workflows/build_20.04.yml | 12 ++-- .github/workflows/build_22.04.yml | 13 +++-- .github/workflows/build_22.04_dynamic.yml | 13 +++-- .github/workflows/build_24.04.yml | 71 +++++++++++++++++++++++ .github/workflows/build_24.04_dynamic.yml | 70 ++++++++++++++++++++++ .github/workflows/build_development.yml | 14 ++--- README.md | 4 +- 8 files changed, 187 insertions(+), 33 deletions(-) create mode 100644 .github/workflows/build_24.04.yml create mode 100644 .github/workflows/build_24.04_dynamic.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e5d4054a..e1349ebe 100644 --- 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, ' Date: Sun, 19 May 2024 15:27:31 +0200 Subject: [PATCH 02/15] Fix argon-dev in 24.04 --- .github/workflows/build_24.04.yml | 4 ++-- .github/workflows/build_24.04_dynamic.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build_24.04.yml b/.github/workflows/build_24.04.yml index 06e1c217..11a2a34f 100644 --- a/.github/workflows/build_24.04.yml +++ b/.github/workflows/build_24.04.yml @@ -14,7 +14,7 @@ jobs: strategy: matrix: - php_version: ["8.1", "8.2", "8.3"] + php_version: ["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 @@ -26,7 +26,7 @@ jobs: 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 + run: sudo apt-get install -yqq cpanminus libxml2-dev systemtap-sdt-dev zlib1g-dev libpcre3-dev libargon2-dev libsodium-dev libkrb5-dev - name: Setup PHP-${{ matrix.php_version }} uses: shivammathur/setup-php@v2 diff --git a/.github/workflows/build_24.04_dynamic.yml b/.github/workflows/build_24.04_dynamic.yml index 5f4169be..d36a1ab1 100644 --- a/.github/workflows/build_24.04_dynamic.yml +++ b/.github/workflows/build_24.04_dynamic.yml @@ -14,7 +14,7 @@ jobs: strategy: matrix: - php_version: ["8.1", "8.2", "8.3"] # "7.0", "7.1", "7.2", "7.3", + php_version: ["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 @@ -26,7 +26,7 @@ jobs: 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 + run: sudo apt-get install -yqq cpanminus libxml2-dev systemtap-sdt-dev zlib1g-dev libpcre3-dev libargon2-dev libsodium-dev libkrb5-dev - name: Setup PHP-${{ matrix.php_version }} uses: shivammathur/setup-php@v2 From e0dbe6c4d58431e53329cb70ea1b3f153cde61cc Mon Sep 17 00:00:00 2001 From: Joanhey Date: Sun, 19 May 2024 15:42:48 +0200 Subject: [PATCH 03/15] Clean names --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e1349ebe..47a18acd 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -24,12 +24,12 @@ env: jobs: build_24-04: - name: Compile PHP Ubuntu 24.04 + name: Ubuntu 24.04 if: ${{ !contains(github.event.head_commit.message, ' Date: Sun, 19 May 2024 16:16:24 +0200 Subject: [PATCH 04/15] Add PHP 8.4 to dev --- .github/workflows/build_development.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_development.yml b/.github/workflows/build_development.yml index 8426f423..d08bf15e 100644 --- a/.github/workflows/build_development.yml +++ b/.github/workflows/build_development.yml @@ -31,7 +31,7 @@ jobs: strategy: matrix: - php_version: ["8.3"] + php_version: ["8.4"] 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. From 75763dd05d136bb27a01e2168153f1caeea264ef Mon Sep 17 00:00:00 2001 From: Joanhey Date: Sun, 19 May 2024 16:32:36 +0200 Subject: [PATCH 05/15] Fix dev workflow --- .github/workflows/build_development.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_development.yml b/.github/workflows/build_development.yml index d08bf15e..8bf7ec4e 100644 --- a/.github/workflows/build_development.yml +++ b/.github/workflows/build_development.yml @@ -3,7 +3,7 @@ name: Build Nightly PHP on: push: branches: - - development + - "development" paths: - "src/**" - "t/**" @@ -12,7 +12,7 @@ on: - "config" pull_request: branches: - - development + - "development" paths: - "src/**" - "t/**" From f9542b9bf6170389f5bd24d05282bfceb2f4bd3a Mon Sep 17 00:00:00 2001 From: Joanhey Date: Sun, 19 May 2024 17:24:06 +0200 Subject: [PATCH 06/15] Fix libargon2-dev in dev --- .github/workflows/build_development.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_development.yml b/.github/workflows/build_development.yml index 8bf7ec4e..b8970dd7 100644 --- a/.github/workflows/build_development.yml +++ b/.github/workflows/build_development.yml @@ -42,7 +42,7 @@ jobs: 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 + run: sudo apt-get install -yqq cpanminus libxml2-dev systemtap-sdt-dev zlib1g-dev libpcre3-dev libargon2-dev libsodium-dev libkrb5-dev - name: Setup PHP-${{ matrix.php_version }} uses: shivammathur/setup-php@v2 From c4fdcc8983779c187868bf0ef7ea06e6326a886f Mon Sep 17 00:00:00 2001 From: Joanhey Date: Sun, 19 May 2024 17:24:44 +0200 Subject: [PATCH 07/15] Try again with 24.04 --- .github/workflows/build_24.04.yml | 3 +-- .github/workflows/build_24.04_dynamic.yml | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build_24.04.yml b/.github/workflows/build_24.04.yml index 11a2a34f..f2e80f9f 100644 --- a/.github/workflows/build_24.04.yml +++ b/.github/workflows/build_24.04.yml @@ -26,7 +26,7 @@ jobs: 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 + 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 @@ -55,7 +55,6 @@ jobs: - 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 diff --git a/.github/workflows/build_24.04_dynamic.yml b/.github/workflows/build_24.04_dynamic.yml index d36a1ab1..551e6e2f 100644 --- a/.github/workflows/build_24.04_dynamic.yml +++ b/.github/workflows/build_24.04_dynamic.yml @@ -26,7 +26,7 @@ jobs: 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 + 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 @@ -56,7 +56,6 @@ jobs: - 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 From 499397f02bda51b6bd151e2d2593da849602aa57 Mon Sep 17 00:00:00 2001 From: Joanhey Date: Sun, 19 May 2024 17:30:11 +0200 Subject: [PATCH 08/15] Fix dev workflow for Ubuntu 24.04 --- .github/workflows/build_development.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/build_development.yml b/.github/workflows/build_development.yml index b8970dd7..f293fbb3 100644 --- a/.github/workflows/build_development.yml +++ b/.github/workflows/build_development.yml @@ -42,7 +42,7 @@ jobs: 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 + 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 @@ -71,7 +71,6 @@ jobs: - 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 From cc3c790dc36e871fe971b57764f6af149ad2a36d Mon Sep 17 00:00:00 2001 From: Joanhey Date: Sun, 19 May 2024 18:27:05 +0200 Subject: [PATCH 09/15] Run dev workflow PHP 8.4 each first of month --- .github/workflows/build_development.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/build_development.yml b/.github/workflows/build_development.yml index f293fbb3..893fc1bc 100644 --- a/.github/workflows/build_development.yml +++ b/.github/workflows/build_development.yml @@ -1,6 +1,10 @@ name: Build Nightly PHP on: + # Each 1 of month + schedule: + - cron: "0 0 1 * *" + push: branches: - "development" From 96c236fae578b529805eb7eb52918d90e11d24e0 Mon Sep 17 00:00:00 2001 From: Joanhey Date: Sun, 19 May 2024 18:42:11 +0200 Subject: [PATCH 10/15] Add nightly PHP build badge in Readme --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 3947bcbb..de68860b 100644 --- a/README.md +++ b/README.md @@ -4,6 +4,7 @@ ngx-php [![GitHub release](https://img.shields.io/github/release/rryqszq4/ngx-php.svg)](https://github.com/rryqszq4/ngx-php/releases/latest) [![license](https://img.shields.io/badge/license-BSD--2--Clause-blue.svg)](https://github.com/rryqszq4/ngx-php/blob/master/LICENSE) [![QQ group](https://img.shields.io/badge/QQ--group-558795330-26bcf5.svg)](https://github.com/rryqszq4/ngx-php) +[![Build Nightly PHP](https://github.com/rryqszq4/ngx-php/actions/workflows/build_development.yml/badge.svg)](https://github.com/rryqszq4/ngx-php/actions/workflows/build_development.yml) ngx-php is an extension module of high-performance web server nginx, which implements embedded PHP7 and PHP8 script to process nginx location and variables. From e9b05ac4b6338ab4d6ffb48eff5c3f3fc072eb65 Mon Sep 17 00:00:00 2001 From: Joanhey Date: Sun, 19 May 2024 20:25:57 +0200 Subject: [PATCH 11/15] Add zend_fameless_function in php_ngx.c <22 --- src/php/impl/php_ngx.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/php/impl/php_ngx.c b/src/php/impl/php_ngx.c index 97bd9e2d..750af72d 100644 --- a/src/php/impl/php_ngx.c +++ b/src/php/impl/php_ngx.c @@ -37,6 +37,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "php_ngx_var.h" #include "php_ngx_header.h" #include "php_ngx_cookie.h" +#include "zend_frameless_function.h" #include "../../ngx_http_php_module.h" From 3ba5cf3df20a54759ec1223c33912766a0070473 Mon Sep 17 00:00:00 2001 From: Joanhey Date: Sun, 19 May 2024 20:35:43 +0200 Subject: [PATCH 12/15] Revert "Add zend_fameless_function in php_ngx.c <22" This reverts commit e9b05ac4b6338ab4d6ffb48eff5c3f3fc072eb65. --- src/php/impl/php_ngx.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/php/impl/php_ngx.c b/src/php/impl/php_ngx.c index 750af72d..97bd9e2d 100644 --- a/src/php/impl/php_ngx.c +++ b/src/php/impl/php_ngx.c @@ -37,7 +37,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "php_ngx_var.h" #include "php_ngx_header.h" #include "php_ngx_cookie.h" -#include "zend_frameless_function.h" #include "../../ngx_http_php_module.h" From f52f8cc6850ac7ae9fdef90b5ce2bc9015408157 Mon Sep 17 00:00:00 2001 From: Joanhey Date: Sun, 19 May 2024 23:41:18 +0200 Subject: [PATCH 13/15] 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 From 01006a6db29e3a9f3ad4a22584b61ad0ebf6841a Mon Sep 17 00:00:00 2001 From: Joanhey Date: Sun, 19 May 2024 23:56:01 +0200 Subject: [PATCH 14/15] Fix permissions --- .github/workflows/build_20.04.yml | 2 +- .github/workflows/build_20.04_dynamic.yml | 2 +- .github/workflows/build_22.04.yml | 2 +- .github/workflows/build_22.04_dynamic.yml | 2 +- .github/workflows/build_24.04.yml | 2 +- .github/workflows/build_24.04_dynamic.yml | 2 +- .github/workflows/build_development.yml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build_20.04.yml b/.github/workflows/build_20.04.yml index 8d104e81..d2ab01ec 100644 --- a/.github/workflows/build_20.04.yml +++ b/.github/workflows/build_20.04.yml @@ -64,5 +64,5 @@ jobs: env: PHP_SRC_VERSION: ${{ matrix.php_version }} run: | - echo echo "opcache.jit=tracing" >> /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 index d96cf7cc..f93f323a 100644 --- a/.github/workflows/build_20.04_dynamic.yml +++ b/.github/workflows/build_20.04_dynamic.yml @@ -65,5 +65,5 @@ jobs: env: PHP_SRC_VERSION: ${{ matrix.php_version }} run: | - sudo echo "opcache.jit=tracing" >> /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 index f3d0e8d6..c14ac2b9 100644 --- a/.github/workflows/build_22.04.yml +++ b/.github/workflows/build_22.04.yml @@ -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 echo "opcache.jit=tracing" >> /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 index 879ad5eb..698b78a7 100644 --- a/.github/workflows/build_22.04_dynamic.yml +++ b/.github/workflows/build_22.04_dynamic.yml @@ -66,5 +66,5 @@ jobs: env: PHP_SRC_VERSION: ${{ matrix.php_version }} run: | - sudo echo "opcache.jit=tracing" >> /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 index 896e91a5..449611b9 100644 --- a/.github/workflows/build_24.04.yml +++ b/.github/workflows/build_24.04.yml @@ -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 echo "opcache.jit=tracing" >> /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_dynamic.yml b/.github/workflows/build_24.04_dynamic.yml index d83be693..b18858ec 100644 --- a/.github/workflows/build_24.04_dynamic.yml +++ b/.github/workflows/build_24.04_dynamic.yml @@ -65,5 +65,5 @@ jobs: env: PHP_SRC_VERSION: ${{ matrix.php_version }} run: | - sudo echo "opcache.jit=tracing" >> /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_development.yml b/.github/workflows/build_development.yml index 151af1bf..d290a566 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 echo "opcache.jit=tracing" >> /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 From 9fb054f9b86936359e725db53eda18e30a6c9146 Mon Sep 17 00:00:00 2001 From: Joanhey Date: Mon, 20 May 2024 00:51:47 +0200 Subject: [PATCH 15/15] Clean workflow names --- .github/workflows/build_22.04_dynamic.yml | 2 +- .github/workflows/build_24.04_dynamic.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_22.04_dynamic.yml b/.github/workflows/build_22.04_dynamic.yml index 698b78a7..09a76b52 100644 --- a/.github/workflows/build_22.04_dynamic.yml +++ b/.github/workflows/build_22.04_dynamic.yml @@ -21,7 +21,7 @@ jobs: # 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 }} + name: Dynamic PHP-${{ matrix.php_version }} Nginx ${{ matrix.nginx_version }} steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/build_24.04_dynamic.yml b/.github/workflows/build_24.04_dynamic.yml index b18858ec..57039a88 100644 --- a/.github/workflows/build_24.04_dynamic.yml +++ b/.github/workflows/build_24.04_dynamic.yml @@ -21,7 +21,7 @@ jobs: # 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 }} + name: Dynamic PHP-${{ matrix.php_version }} Nginx ${{ matrix.nginx_version }} steps: - uses: actions/checkout@v4