From 3ee06f338ceb9db1e197bbd1dd453a18fe8c8ee3 Mon Sep 17 00:00:00 2001 From: provokateurin Date: Wed, 10 Jun 2026 16:38:49 +0200 Subject: [PATCH] ci(PHP): Only test against highest and lowest supported PHP versions Signed-off-by: provokateurin --- .github/workflows/autocheckers.yml | 16 ++++------------ .github/workflows/files-external-ftp.yml | 2 +- .github/workflows/files-external-s3.yml | 4 ++-- .github/workflows/files-external-sftp.yml | 2 +- .github/workflows/files-external-smb.yml | 2 +- .github/workflows/files-external-webdav.yml | 2 +- .github/workflows/files-external.yml | 2 +- .github/workflows/integration-dav.yml | 2 +- .github/workflows/integration-litmus.yml | 2 +- .github/workflows/integration-s3-primary.yml | 2 +- .github/workflows/integration-sqlite.yml | 2 +- .github/workflows/lint-php.yml | 2 +- .github/workflows/object-storage-azure.yml | 2 +- .github/workflows/object-storage-s3.yml | 2 +- .github/workflows/object-storage-swift.yml | 2 +- .github/workflows/performance.yml | 11 +++-------- .github/workflows/phpunit-32bits.yml | 2 +- .github/workflows/phpunit-mariadb.yml | 8 ++++---- .github/workflows/phpunit-memcached.yml | 2 +- .github/workflows/phpunit-mysql-sharding.yml | 7 +++++-- .github/workflows/phpunit-nodb.yml | 2 +- .../workflows/phpunit-object-store-primary.yml | 4 ++-- .github/workflows/phpunit-pgsql.yml | 12 ++++-------- .github/workflows/phpunit-sqlite.yml | 2 +- .github/workflows/rector-apply.yml | 9 ++------- tests/lib/Files/ObjectStore/S3Test.php | 4 ++-- 26 files changed, 45 insertions(+), 64 deletions(-) diff --git a/.github/workflows/autocheckers.yml b/.github/workflows/autocheckers.yml index c689bb7cccc..b213d2b3d78 100644 --- a/.github/workflows/autocheckers.yml +++ b/.github/workflows/autocheckers.yml @@ -44,10 +44,6 @@ jobs: needs: changes if: needs.changes.outputs.src != 'false' - strategy: - matrix: - php-versions: ['8.2'] - name: PHP checkers steps: @@ -57,11 +53,11 @@ jobs: persist-credentials: false submodules: true - - name: Set up php ${{ matrix.php-versions }} + - name: Set up php uses: shivammathur/setup-php@7c071dfe9dc99bdf297fa79cb49ea005b9fcadbc #v2.37.1 timeout-minutes: 5 with: - php-version: ${{ matrix.php-versions }} + php-version: '8.2' extensions: bz2, ctype, curl, dom, fileinfo, gd, iconv, intl, json, libxml, mbstring, openssl, pcntl, posix, session, simplexml, xmlreader, xmlwriter, zip, zlib, sqlite, pdo_sqlite coverage: none ini-file: development @@ -77,10 +73,6 @@ jobs: needs: changes if: needs.changes.outputs.src != 'false' - strategy: - matrix: - php-versions: ['8.2'] - name: Translation and Files checkers steps: @@ -90,11 +82,11 @@ jobs: persist-credentials: false submodules: true - - name: Set up php ${{ matrix.php-versions }} + - name: Set up php uses: shivammathur/setup-php@7c071dfe9dc99bdf297fa79cb49ea005b9fcadbc #v2.37.1 timeout-minutes: 5 with: - php-version: ${{ matrix.php-versions }} + php-version: '8.2' extensions: bz2, ctype, curl, dom, fileinfo, gd, iconv, intl, json, libxml, mbstring, openssl, pcntl, posix, session, simplexml, xmlreader, xmlwriter, zip, zlib, sqlite, pdo_sqlite coverage: none ini-file: development diff --git a/.github/workflows/files-external-ftp.yml b/.github/workflows/files-external-ftp.yml index 43b808f8028..0c48728b367 100644 --- a/.github/workflows/files-external-ftp.yml +++ b/.github/workflows/files-external-ftp.yml @@ -55,7 +55,7 @@ jobs: strategy: fail-fast: false matrix: - php-versions: ['8.2', '8.4'] + php-versions: ['8.2', '8.5'] ftpd: ['proftpd', 'vsftpd', 'pure-ftpd'] name: php${{ matrix.php-versions }}-${{ matrix.ftpd }} diff --git a/.github/workflows/files-external-s3.yml b/.github/workflows/files-external-s3.yml index ad28b894a61..f3747abd5ee 100644 --- a/.github/workflows/files-external-s3.yml +++ b/.github/workflows/files-external-s3.yml @@ -55,7 +55,7 @@ jobs: strategy: fail-fast: false matrix: - php-versions: ['8.2', '8.3', '8.4'] + php-versions: ['8.2', '8.5'] name: php${{ matrix.php-versions }}-s3-minio @@ -129,7 +129,7 @@ jobs: strategy: matrix: - php-versions: ['8.2', '8.3', '8.4'] + php-versions: ['8.2', '8.5'] name: php${{ matrix.php-versions }}-s3-localstack diff --git a/.github/workflows/files-external-sftp.yml b/.github/workflows/files-external-sftp.yml index ccb04d0e5b1..7b367393ecd 100644 --- a/.github/workflows/files-external-sftp.yml +++ b/.github/workflows/files-external-sftp.yml @@ -55,7 +55,7 @@ jobs: strategy: fail-fast: false matrix: - php-versions: ['8.2', '8.4'] + php-versions: ['8.2', '8.5'] sftpd: ['openssh'] name: php${{ matrix.php-versions }}-${{ matrix.sftpd }} diff --git a/.github/workflows/files-external-smb.yml b/.github/workflows/files-external-smb.yml index 0bb805864ff..c2535374ca0 100644 --- a/.github/workflows/files-external-smb.yml +++ b/.github/workflows/files-external-smb.yml @@ -55,7 +55,7 @@ jobs: strategy: fail-fast: false matrix: - php-versions: ['8.2'] + php-versions: ['8.2', '8.5'] name: php${{ matrix.php-versions }}-smb diff --git a/.github/workflows/files-external-webdav.yml b/.github/workflows/files-external-webdav.yml index af4d192a72d..a4fd96a8e6d 100644 --- a/.github/workflows/files-external-webdav.yml +++ b/.github/workflows/files-external-webdav.yml @@ -55,7 +55,7 @@ jobs: strategy: fail-fast: false matrix: - php-versions: ['8.2', '8.3', '8.4'] + php-versions: ['8.2', '8.5'] name: php${{ matrix.php-versions }}-webdav diff --git a/.github/workflows/files-external.yml b/.github/workflows/files-external.yml index 9c02624fa5b..94301665423 100644 --- a/.github/workflows/files-external.yml +++ b/.github/workflows/files-external.yml @@ -55,7 +55,7 @@ jobs: strategy: fail-fast: false matrix: - php-versions: ['8.2', '8.3', '8.4'] + php-versions: ['8.2', '8.5'] name: php${{ matrix.php-versions }}-generic diff --git a/.github/workflows/integration-dav.yml b/.github/workflows/integration-dav.yml index 977cf263be9..8d7f0474097 100644 --- a/.github/workflows/integration-dav.yml +++ b/.github/workflows/integration-dav.yml @@ -45,7 +45,7 @@ jobs: strategy: fail-fast: false matrix: - php-versions: ['8.2'] + php-versions: ['8.2', '8.5'] endpoint: ['old', 'new'] service: ['CalDAV', 'CardDAV'] diff --git a/.github/workflows/integration-litmus.yml b/.github/workflows/integration-litmus.yml index 61f9db6c28e..870694cad34 100644 --- a/.github/workflows/integration-litmus.yml +++ b/.github/workflows/integration-litmus.yml @@ -45,7 +45,7 @@ jobs: strategy: fail-fast: false matrix: - php-versions: ['8.2'] + php-versions: ['8.2', '8.5'] endpoint: ['webdav', 'dav'] name: Litmus WebDAV ${{ matrix.endpoint }} diff --git a/.github/workflows/integration-s3-primary.yml b/.github/workflows/integration-s3-primary.yml index 2dfc3f5df33..9ffe860523f 100644 --- a/.github/workflows/integration-s3-primary.yml +++ b/.github/workflows/integration-s3-primary.yml @@ -54,7 +54,7 @@ jobs: strategy: fail-fast: false matrix: - php-versions: ['8.2'] + php-versions: ['8.2', '8.5'] key: ['objectstore', 'objectstore_multibucket'] name: php${{ matrix.php-versions }}-${{ matrix.key }}-minio diff --git a/.github/workflows/integration-sqlite.yml b/.github/workflows/integration-sqlite.yml index 3a0bbcce85a..349b3eeaf5a 100644 --- a/.github/workflows/integration-sqlite.yml +++ b/.github/workflows/integration-sqlite.yml @@ -69,7 +69,7 @@ jobs: - 'videoverification_features' - 'guests_features' - php-versions: ['8.4'] + php-versions: ['8.2', '8.5'] guests-versions: ['main'] spreed-versions: ['main'] activity-versions: ['master'] diff --git a/.github/workflows/lint-php.yml b/.github/workflows/lint-php.yml index 690be87da90..a0f2e79d875 100644 --- a/.github/workflows/lint-php.yml +++ b/.github/workflows/lint-php.yml @@ -47,7 +47,7 @@ jobs: strategy: matrix: - php-versions: [ '8.2', '8.3', '8.4', '8.5' ] + php-versions: ['8.2', '8.5'] name: php-lint diff --git a/.github/workflows/object-storage-azure.yml b/.github/workflows/object-storage-azure.yml index 231702033d5..0d96af6f396 100644 --- a/.github/workflows/object-storage-azure.yml +++ b/.github/workflows/object-storage-azure.yml @@ -55,7 +55,7 @@ jobs: strategy: fail-fast: false matrix: - php-versions: ['8.2', '8.3', '8.4'] + php-versions: ['8.2', '8.5'] name: php${{ matrix.php-versions }}-azure diff --git a/.github/workflows/object-storage-s3.yml b/.github/workflows/object-storage-s3.yml index fb4c6ad2beb..6771ef3d7e6 100644 --- a/.github/workflows/object-storage-s3.yml +++ b/.github/workflows/object-storage-s3.yml @@ -55,7 +55,7 @@ jobs: strategy: fail-fast: false matrix: - php-versions: ['8.2', '8.3'] + php-versions: ['8.2', '8.5'] name: php${{ matrix.php-versions }}-s3 diff --git a/.github/workflows/object-storage-swift.yml b/.github/workflows/object-storage-swift.yml index b5ae9e3ead7..f5403ed8175 100644 --- a/.github/workflows/object-storage-swift.yml +++ b/.github/workflows/object-storage-swift.yml @@ -55,7 +55,7 @@ jobs: strategy: fail-fast: false matrix: - php-versions: ['8.2', '8.3'] + php-versions: ['8.2', '8.5'] name: php${{ matrix.php-versions }}-swift diff --git a/.github/workflows/performance.yml b/.github/workflows/performance.yml index 6aec70583b6..b366f42b903 100644 --- a/.github/workflows/performance.yml +++ b/.github/workflows/performance.yml @@ -26,12 +26,7 @@ jobs: permissions: pull-requests: write - strategy: - fail-fast: false - matrix: - php-versions: ['8.2'] - - name: performance-${{ matrix.php-versions }} + name: performance steps: @@ -42,11 +37,11 @@ jobs: submodules: true ref: ${{ github.event.pull_request.base.ref }} - - name: Set up php ${{ matrix.php-versions }} + - name: Set up php uses: shivammathur/setup-php@7c071dfe9dc99bdf297fa79cb49ea005b9fcadbc # v2.37.1 timeout-minutes: 5 with: - php-version: ${{ matrix.php-versions }} + php-version: '8.2' extensions: bz2, ctype, curl, dom, fileinfo, gd, iconv, intl, json, libxml, mbstring, openssl, pcntl, posix, redis, session, simplexml, xmlreader, xmlwriter, zip, zlib, sqlite, pdo_sqlite env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/phpunit-32bits.yml b/.github/workflows/phpunit-32bits.yml index fb6aa7bd4b4..6a6b79cfab4 100644 --- a/.github/workflows/phpunit-32bits.yml +++ b/.github/workflows/phpunit-32bits.yml @@ -30,7 +30,7 @@ jobs: strategy: fail-fast: false matrix: - php-versions: ["8.4"] + php-versions: ['8.2', '8,5'] steps: - name: Checkout server diff --git a/.github/workflows/phpunit-mariadb.yml b/.github/workflows/phpunit-mariadb.yml index 4f5c977c026..9df007bc385 100644 --- a/.github/workflows/phpunit-mariadb.yml +++ b/.github/workflows/phpunit-mariadb.yml @@ -60,10 +60,10 @@ jobs: fail-fast: false matrix: include: - - php-versions: '8.2' - mariadb-versions: '10.6' - - php-versions: '8.5' - mariadb-versions: '11.8' + - mariadb-versions: '10.6' + php-versions: '8.2' + - mariadb-versions: '11.8' + php-versions: '8.5' name: MariaDB ${{ matrix.mariadb-versions }} (PHP ${{ matrix.php-versions }}) - database tests diff --git a/.github/workflows/phpunit-memcached.yml b/.github/workflows/phpunit-memcached.yml index eb974709163..1033b6768be 100644 --- a/.github/workflows/phpunit-memcached.yml +++ b/.github/workflows/phpunit-memcached.yml @@ -56,7 +56,7 @@ jobs: strategy: fail-fast: false matrix: - php-versions: ['8.2', '8.3', '8.4', '8.5'] + php-versions: ['8.2', '8.5'] name: Memcached (PHP ${{ matrix.php-versions }}) diff --git a/.github/workflows/phpunit-mysql-sharding.yml b/.github/workflows/phpunit-mysql-sharding.yml index b6f0773c053..8754c0294dd 100644 --- a/.github/workflows/phpunit-mysql-sharding.yml +++ b/.github/workflows/phpunit-mysql-sharding.yml @@ -56,8 +56,11 @@ jobs: strategy: fail-fast: false matrix: - php-versions: ["8.2"] - mysql-versions: ["8.4"] + include: + - mysql-versions: '8.0' + php-versions: '8.2' + - mysql-versions: '8.4' + php-versions: '8.5' name: Sharding - MySQL ${{ matrix.mysql-versions }} (PHP ${{ matrix.php-versions }}) - database tests diff --git a/.github/workflows/phpunit-nodb.yml b/.github/workflows/phpunit-nodb.yml index 39c5d423526..b8006c332a0 100644 --- a/.github/workflows/phpunit-nodb.yml +++ b/.github/workflows/phpunit-nodb.yml @@ -59,7 +59,7 @@ jobs: strategy: fail-fast: false matrix: - php-versions: ["8.2", "8.3", "8.4", "8.5"] + php-versions: ['8.2', '8.5'] name: No DB unit tests (PHP ${{ matrix.php-versions }}) diff --git a/.github/workflows/phpunit-object-store-primary.yml b/.github/workflows/phpunit-object-store-primary.yml index 0b1e0106b71..4499b9c5f91 100644 --- a/.github/workflows/phpunit-object-store-primary.yml +++ b/.github/workflows/phpunit-object-store-primary.yml @@ -49,8 +49,8 @@ jobs: strategy: fail-fast: false matrix: - php-versions: ["8.2"] - key: ["s3", "s3-multibucket"] + php-versions: ['8.2', '8.5'] + key: ['s3', 's3-multibucket'] name: php${{ matrix.php-versions }}-${{ matrix.key }}-minio diff --git a/.github/workflows/phpunit-pgsql.yml b/.github/workflows/phpunit-pgsql.yml index 6fb8f67f55f..798f2a0a166 100644 --- a/.github/workflows/phpunit-pgsql.yml +++ b/.github/workflows/phpunit-pgsql.yml @@ -60,14 +60,10 @@ jobs: fail-fast: false matrix: include: - - php-versions: '8.2' - postgres-versions: '14' - - php-versions: '8.3' - postgres-versions: '18' - - php-versions: '8.4' - postgres-versions: '18' - - php-versions: '8.5' - postgres-versions: '18' + - postgres-versions: '14' + php-versions: '8.2' + - postgres-versions: '18' + php-versions: '8.5' name: PostgreSQL ${{ matrix.postgres-versions }} (PHP ${{ matrix.php-versions }}) - database tests diff --git a/.github/workflows/phpunit-sqlite.yml b/.github/workflows/phpunit-sqlite.yml index cc817a84391..8322a397117 100644 --- a/.github/workflows/phpunit-sqlite.yml +++ b/.github/workflows/phpunit-sqlite.yml @@ -59,7 +59,7 @@ jobs: strategy: fail-fast: false matrix: - php-versions: ['8.5'] + php-versions: ['8.2', '8.5'] name: SQLite (PHP ${{ matrix.php-versions }}) diff --git a/.github/workflows/rector-apply.yml b/.github/workflows/rector-apply.yml index d6f72e31d58..48a7a1faad8 100644 --- a/.github/workflows/rector-apply.yml +++ b/.github/workflows/rector-apply.yml @@ -21,11 +21,6 @@ jobs: build: runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - php-versions: [ '8.2' ] - name: rector-apply steps: @@ -36,10 +31,10 @@ jobs: persist-credentials: false ref: ${{ github.event.repository.default_branch }} - - name: Set up php${{ matrix.php-versions }} + - name: Set up php uses: shivammathur/setup-php@7c071dfe9dc99bdf297fa79cb49ea005b9fcadbc # v2.37.1 with: - php-version: ${{ matrix.php-versions }} + php-version: '8.2' extensions: bz2, ctype, curl, dom, fileinfo, gd, iconv, intl, json, libxml, mbstring, openssl, pcntl, posix, session, simplexml, xmlreader, xmlwriter, zip, zlib, sqlite, pdo_sqlite coverage: none ini-file: development diff --git a/tests/lib/Files/ObjectStore/S3Test.php b/tests/lib/Files/ObjectStore/S3Test.php index 44e7d65c7e4..c5e5e0685ff 100644 --- a/tests/lib/Files/ObjectStore/S3Test.php +++ b/tests/lib/Files/ObjectStore/S3Test.php @@ -150,8 +150,8 @@ class S3Test extends ObjectStoreTestCase { #[\PHPUnit\Framework\Attributes\DataProvider('dataFileSizes')] public function testFileSizes($size): void { - if (str_starts_with(PHP_VERSION, '8.3') && getenv('CI')) { - $this->markTestSkipped('Test is unreliable and skipped on 8.3'); + if (str_starts_with(PHP_VERSION, '8.5') && getenv('CI')) { + $this->markTestSkipped('Test is unreliable and skipped on 8.5'); } $this->cleanupAfter('testfilesizes');