From 1daa881b031c968d260e8f1bce9fd5dfdac8acbc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=B4me=20Chilliet?= Date: Thu, 10 Aug 2023 15:52:20 +0200 Subject: [PATCH 1/5] Allow PHP 8.3 in version check MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Côme Chilliet --- lib/versioncheck.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/versioncheck.php b/lib/versioncheck.php index 8869fe9545331..29c278370cd58 100644 --- a/lib/versioncheck.php +++ b/lib/versioncheck.php @@ -33,10 +33,10 @@ exit(1); } -// Show warning if >= PHP 8.3 is used as Nextcloud is not compatible with >= PHP 8.3 for now -if (PHP_VERSION_ID >= 80300) { +// Show warning if >= PHP 8.4 is used as Nextcloud is not compatible with >= PHP 8.4 for now +if (PHP_VERSION_ID >= 80400) { http_response_code(500); - echo 'This version of Nextcloud is not compatible with PHP>=8.3.
'; + echo 'This version of Nextcloud is not compatible with PHP>=8.4.
'; echo 'You are currently running ' . PHP_VERSION . '.'; exit(1); } From 796bf329b6a51a933bf0975522335eafad05ab60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=B4me=20Chilliet?= Date: Mon, 14 Aug 2023 16:13:28 +0200 Subject: [PATCH 2/5] Adding ini-file:development to 32bit CI MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Côme Chilliet --- .github/workflows/phpunit-32bits.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/phpunit-32bits.yml b/.github/workflows/phpunit-32bits.yml index 8a831f87556da..5a2cca235ab06 100644 --- a/.github/workflows/phpunit-32bits.yml +++ b/.github/workflows/phpunit-32bits.yml @@ -46,6 +46,7 @@ jobs: extensions: ctype, curl, dom, fileinfo, gd, imagick, intl, json, mbstring, openssl, pdo_sqlite, posix, sqlite, xml, zip, apcu tools: phpunit:9 coverage: none + ini-file: development ini-values: apc.enabled=on, apc.enable_cli=on From e20ba1cab1943942c0b23a3567cad1cda0633534 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=B4me=20Chilliet?= Date: Tue, 26 Sep 2023 09:34:01 +0200 Subject: [PATCH 3/5] Add 8.3 to lint CI and 32bits test suite MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Côme Chilliet --- .github/workflows/lint-php.yml | 2 +- .github/workflows/phpunit-32bits.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/lint-php.yml b/.github/workflows/lint-php.yml index d6922bf1cd66a..e7230f64ba89b 100644 --- a/.github/workflows/lint-php.yml +++ b/.github/workflows/lint-php.yml @@ -25,7 +25,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - php-versions: [ "8.0", "8.1", "8.2" ] + php-versions: [ "8.0", "8.1", "8.2", "8.3" ] name: php-lint diff --git a/.github/workflows/phpunit-32bits.yml b/.github/workflows/phpunit-32bits.yml index 5a2cca235ab06..37588d2e7e7a9 100644 --- a/.github/workflows/phpunit-32bits.yml +++ b/.github/workflows/phpunit-32bits.yml @@ -26,7 +26,7 @@ jobs: strategy: matrix: - php-versions: ['8.0'] + php-versions: ['8.0','8.3'] steps: - name: Checkout server From 5586f2d4c4d19c3f43c39a3fb3f9ca5de07aa40b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=B4me=20Chilliet?= Date: Tue, 26 Sep 2023 11:05:23 +0200 Subject: [PATCH 4/5] Use latest shivammathur/setup-php in phpunit-32bits.yml MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Côme Chilliet --- .github/workflows/phpunit-32bits.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/phpunit-32bits.yml b/.github/workflows/phpunit-32bits.yml index 37588d2e7e7a9..4ecc62510050d 100644 --- a/.github/workflows/phpunit-32bits.yml +++ b/.github/workflows/phpunit-32bits.yml @@ -40,7 +40,7 @@ jobs: sudo apt-get install -y ffmpeg imagemagick libmagickcore-6.q16-3-extra - name: Set up php ${{ matrix.php-versions }} - uses: shivammathur/setup-php@9c77701ae57b0c47f6732beebfbdec76e4e5c90a #debian bookworm fix + uses: shivammathur/setup-php@72ae4ccbe57f82bbe08411e84e2130bd4ba1c10f #v2.25.5 with: php-version: ${{ matrix.php-versions }} extensions: ctype, curl, dom, fileinfo, gd, imagick, intl, json, mbstring, openssl, pdo_sqlite, posix, sqlite, xml, zip, apcu From 7e0ed6b636ec3622920bbce6034e41044f0b8897 Mon Sep 17 00:00:00 2001 From: Daniel Kesselberg Date: Sat, 30 Sep 2023 00:20:21 +0200 Subject: [PATCH 5/5] ci: clear disable_functions to enable pcntl_signal When using ini-file development then disable_functions forbids pcntl_signal by default. Signed-off-by: Daniel Kesselberg --- .github/workflows/phpunit-32bits.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/phpunit-32bits.yml b/.github/workflows/phpunit-32bits.yml index 4ecc62510050d..beafe11cdc334 100644 --- a/.github/workflows/phpunit-32bits.yml +++ b/.github/workflows/phpunit-32bits.yml @@ -48,8 +48,7 @@ jobs: coverage: none ini-file: development ini-values: - apc.enabled=on, - apc.enable_cli=on + apc.enabled=on, apc.enable_cli=on, disable_functions= # https://github.com/shivammathur/setup-php/discussions/573 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}