From fd89f703e774feb8a775b5f8b9f7f17d8d5ee0e4 Mon Sep 17 00:00:00 2001 From: provokateurin Date: Wed, 10 Jun 2026 15:50:19 +0200 Subject: [PATCH 1/2] ci(PHP): Remove coverage collection and upload Signed-off-by: provokateurin --- .github/workflows/files-external-ftp.yml | 21 +-------- .github/workflows/files-external-s3.yml | 46 +++----------------- .github/workflows/files-external-sftp.yml | 21 +-------- .github/workflows/files-external-smb.yml | 22 ++-------- .github/workflows/files-external-webdav.yml | 23 ++-------- .github/workflows/files-external.yml | 23 ++-------- .github/workflows/integration-dav.yml | 2 +- .github/workflows/integration-litmus.yml | 2 +- .github/workflows/integration-s3-primary.yml | 2 +- .github/workflows/object-storage-azure.yml | 22 ++-------- .github/workflows/object-storage-s3.yml | 22 ++-------- .github/workflows/object-storage-swift.yml | 22 ++-------- .github/workflows/phpunit-mariadb.yml | 18 +------- .github/workflows/phpunit-memcached.yml | 22 ++-------- .github/workflows/phpunit-mysql-sharding.yml | 17 +------- .github/workflows/phpunit-mysql.yml | 18 +------- .github/workflows/phpunit-nodb.yml | 22 ++-------- .github/workflows/phpunit-oci.yml | 18 +------- .github/workflows/phpunit-pgsql.yml | 18 +------- .github/workflows/phpunit-sqlite.yml | 21 ++------- 20 files changed, 50 insertions(+), 332 deletions(-) diff --git a/.github/workflows/files-external-ftp.yml b/.github/workflows/files-external-ftp.yml index 9b0e170ac28..43b808f8028 100644 --- a/.github/workflows/files-external-ftp.yml +++ b/.github/workflows/files-external-ftp.yml @@ -57,9 +57,6 @@ jobs: matrix: php-versions: ['8.2', '8.4'] ftpd: ['proftpd', 'vsftpd', 'pure-ftpd'] - include: - - php-versions: '8.2' - coverage: ${{ github.event_name != 'pull_request' }} name: php${{ matrix.php-versions }}-${{ matrix.ftpd }} @@ -87,7 +84,7 @@ jobs: php-version: ${{ matrix.php-versions }} # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation 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 - coverage: ${{ matrix.coverage && 'xdebug' || 'none' }} + coverage: none env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -110,21 +107,7 @@ jobs: - name: PHPUnit run: composer run test:files_external -- \ apps/files_external/tests/Storage/FtpTest.php \ - --log-junit junit.xml \ - ${{ matrix.coverage && '--coverage-clover ./clover.xml' || '' }} - - - name: Upload code coverage - if: ${{ !cancelled() && matrix.coverage }} - uses: codecov/codecov-action@e79a6962e0d4c0c17b229090214935d2e33f8354 # v6.0.1 - with: - files: ./clover.xml - flags: phpunit-files-external-ftp - - - name: Upload test results - if: ${{ !cancelled() }} - uses: codecov/test-results-action@0fa95f0e1eeaafde2c782583b36b28ad0d8c77d3 # v1.2.1 - with: - flags: phpunit-files-external-ftp + --log-junit junit.xml - name: ftpd logs if: always() diff --git a/.github/workflows/files-external-s3.yml b/.github/workflows/files-external-s3.yml index b516d740206..ad28b894a61 100644 --- a/.github/workflows/files-external-s3.yml +++ b/.github/workflows/files-external-s3.yml @@ -55,10 +55,7 @@ jobs: strategy: fail-fast: false matrix: - php-versions: ['8.2', '8.4'] - include: - - php-versions: '8.3' - coverage: ${{ github.event_name != 'pull_request' }} + php-versions: ['8.2', '8.3', '8.4'] name: php${{ matrix.php-versions }}-s3-minio @@ -86,7 +83,7 @@ jobs: php-version: ${{ matrix.php-versions }} # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation 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 - coverage: ${{ matrix.coverage && 'xdebug' || 'none' }} + coverage: none ini-file: development ini-values: disable_functions="" env: @@ -111,21 +108,7 @@ jobs: composer run test:files_external -- \ --group S3 \ --log-junit junit.xml \ - apps/files_external/tests/Storage \ - ${{ matrix.coverage && '--coverage-clover ./clover.xml' || '' }} - - - name: Upload code coverage - if: ${{ !cancelled() && matrix.coverage }} - uses: codecov/codecov-action@e79a6962e0d4c0c17b229090214935d2e33f8354 # v6.0.1 - with: - files: ./clover.xml - flags: phpunit-files-external-s3 - - - name: Upload test results - if: ${{ !cancelled() }} - uses: codecov/test-results-action@0fa95f0e1eeaafde2c782583b36b28ad0d8c77d3 # v1.2.1 - with: - flags: phpunit-files-external-s3 + apps/files_external/tests/Storage - name: Nextcloud logs if: always() @@ -146,10 +129,7 @@ jobs: strategy: matrix: - php-versions: ['8.2', '8.4'] - include: - - php-versions: '8.3' - coverage: ${{ github.event_name != 'pull_request' }} + php-versions: ['8.2', '8.3', '8.4'] name: php${{ matrix.php-versions }}-s3-localstack @@ -176,7 +156,7 @@ jobs: php-version: ${{ matrix.php-versions }} # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation 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 - coverage: ${{ matrix.coverage && 'xdebug' || 'none' }} + coverage: none ini-file: development ini-values: disable_functions="" env: @@ -194,21 +174,7 @@ jobs: composer run test:files_external -- \ --group S3 \ --log-junit junit.xml \ - apps/files_external/tests/Storage \ - ${{ matrix.coverage && '--coverage-clover ./clover.xml' || '' }} - - - name: Upload code coverage - if: ${{ !cancelled() && matrix.coverage }} - uses: codecov/codecov-action@e79a6962e0d4c0c17b229090214935d2e33f8354 # v6.0.1 - with: - files: ./clover.xml - flags: phpunit-files-external-s3 - - - name: Upload test results - if: ${{ !cancelled() }} - uses: codecov/test-results-action@0fa95f0e1eeaafde2c782583b36b28ad0d8c77d3 # v1.2.1 - with: - flags: phpunit-files-external-s3 + apps/files_external/tests/Storage - name: S3 logs if: always() diff --git a/.github/workflows/files-external-sftp.yml b/.github/workflows/files-external-sftp.yml index 553088d8eb6..ccb04d0e5b1 100644 --- a/.github/workflows/files-external-sftp.yml +++ b/.github/workflows/files-external-sftp.yml @@ -57,9 +57,6 @@ jobs: matrix: php-versions: ['8.2', '8.4'] sftpd: ['openssh'] - include: - - php-versions: '8.2' - coverage: ${{ github.event_name != 'pull_request' }} name: php${{ matrix.php-versions }}-${{ matrix.sftpd }} @@ -83,7 +80,7 @@ jobs: php-version: ${{ matrix.php-versions }} # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation 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 - coverage: ${{ matrix.coverage && 'xdebug' || 'none' }} + coverage: none env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -98,21 +95,7 @@ jobs: - name: PHPUnit run: composer run test:files_external -- \ apps/files_external/tests/Storage/SftpTest.php \ - --log-junit junit.xml \ - ${{ matrix.coverage && '--coverage-clover ./clover.xml' || '' }} - - - name: Upload code coverage - if: ${{ !cancelled() && matrix.coverage }} - uses: codecov/codecov-action@e79a6962e0d4c0c17b229090214935d2e33f8354 # v6.0.1 - with: - files: ./clover.xml - flags: phpunit-files-external-sftp - - - name: Upload test results - if: ${{ !cancelled() }} - uses: codecov/test-results-action@0fa95f0e1eeaafde2c782583b36b28ad0d8c77d3 # v1.2.1 - with: - flags: phpunit-files-external-sftp + --log-junit junit.xml - name: sftpd logs if: always() diff --git a/.github/workflows/files-external-smb.yml b/.github/workflows/files-external-smb.yml index 5754a82c357..0bb805864ff 100644 --- a/.github/workflows/files-external-smb.yml +++ b/.github/workflows/files-external-smb.yml @@ -55,9 +55,7 @@ jobs: strategy: fail-fast: false matrix: - include: - - php-versions: '8.2' - coverage: ${{ github.event_name != 'pull_request' }} + php-versions: ['8.2'] name: php${{ matrix.php-versions }}-smb @@ -87,7 +85,7 @@ jobs: php-version: ${{ matrix.php-versions }} # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation extensions: bz2, ctype, curl, dom, fileinfo, gd, iconv, intl, json, libxml, mbstring, openssl, pcntl, posix, redis, session, simplexml, xmlreader, xmlwriter, zip, zlib, smbclient, sqlite, pdo_sqlite - coverage: ${{ matrix.coverage && 'xdebug' || 'none' }} + coverage: none ini-file: development ini-values: disable_functions="" env: @@ -114,21 +112,7 @@ jobs: - name: PHPUnit run: composer run test:files_external -- \ apps/files_external/tests/Storage/SmbTest.php \ - --log-junit junit.xml \ - ${{ matrix.coverage && '--coverage-clover ./clover.xml' || '' }} - - - name: Upload code coverage - if: ${{ !cancelled() && matrix.coverage }} - uses: codecov/codecov-action@e79a6962e0d4c0c17b229090214935d2e33f8354 # v6.0.1 - with: - files: ./clover.xml - flags: phpunit-files-external-smb - - - name: Upload test results - if: ${{ !cancelled() }} - uses: codecov/test-results-action@0fa95f0e1eeaafde2c782583b36b28ad0d8c77d3 # v1.2.1 - with: - flags: phpunit-files-external-smb + --log-junit junit.xml files-external-smb-summary: runs-on: ubuntu-latest-low diff --git a/.github/workflows/files-external-webdav.yml b/.github/workflows/files-external-webdav.yml index 9066dd33d31..af4d192a72d 100644 --- a/.github/workflows/files-external-webdav.yml +++ b/.github/workflows/files-external-webdav.yml @@ -55,10 +55,7 @@ jobs: strategy: fail-fast: false matrix: - php-versions: ['8.3', '8.4'] - include: - - php-versions: '8.2' - coverage: ${{ github.event_name != 'pull_request' }} + php-versions: ['8.2', '8.3', '8.4'] name: php${{ matrix.php-versions }}-webdav @@ -82,7 +79,7 @@ jobs: php-version: ${{ matrix.php-versions }} # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation 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 - coverage: ${{ matrix.coverage && 'xdebug' || 'none' }} + coverage: none ini-file: development ini-values: disable_functions="" env: @@ -104,21 +101,7 @@ jobs: - name: PHPUnit run: composer run test:files_external -- \ apps/files_external/tests/Storage/WebdavTest.php \ - --log-junit junit.xml \ - ${{ matrix.coverage && '--coverage-clover ./clover.xml' || '' }} - - - name: Upload code coverage - if: ${{ !cancelled() && matrix.coverage }} - uses: codecov/codecov-action@e79a6962e0d4c0c17b229090214935d2e33f8354 # v6.0.1 - with: - files: ./clover.xml - flags: phpunit-files-external-webdav - - - name: Upload test results - if: ${{ !cancelled() }} - uses: codecov/test-results-action@0fa95f0e1eeaafde2c782583b36b28ad0d8c77d3 # v1.2.1 - with: - flags: phpunit-files-external-webdav + --log-junit junit.xml files-external-webdav-summary: runs-on: ubuntu-latest-low diff --git a/.github/workflows/files-external.yml b/.github/workflows/files-external.yml index ac33cdac838..9c02624fa5b 100644 --- a/.github/workflows/files-external.yml +++ b/.github/workflows/files-external.yml @@ -55,10 +55,7 @@ jobs: strategy: fail-fast: false matrix: - php-versions: ['8.3', '8.4'] - include: - - php-versions: '8.2' - coverage: ${{ github.event_name != 'pull_request' }} + php-versions: ['8.2', '8.3', '8.4'] name: php${{ matrix.php-versions }}-generic @@ -76,7 +73,7 @@ jobs: php-version: ${{ matrix.php-versions }} # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation 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 - coverage: ${{ matrix.coverage && 'xdebug' || 'none' }} + coverage: none ini-file: development ini-values: disable_functions="" env: @@ -93,21 +90,7 @@ jobs: - name: PHPUnit run: composer run test:files_external -- \ - --log-junit junit.xml \ - ${{ matrix.coverage && '--coverage-clover ./clover.xml' || '' }} - - - name: Upload code coverage - if: ${{ !cancelled() && matrix.coverage }} - uses: codecov/codecov-action@e79a6962e0d4c0c17b229090214935d2e33f8354 # v6.0.1 - with: - files: ./clover.xml - flags: phpunit-files-external-generic - - - name: Upload test results - if: ${{ !cancelled() }} - uses: codecov/test-results-action@0fa95f0e1eeaafde2c782583b36b28ad0d8c77d3 # v1.2.1 - with: - flags: phpunit-files-external-generic + --log-junit junit.xml files-external-summary: runs-on: ubuntu-latest-low diff --git a/.github/workflows/integration-dav.yml b/.github/workflows/integration-dav.yml index df62ac369f1..977cf263be9 100644 --- a/.github/workflows/integration-dav.yml +++ b/.github/workflows/integration-dav.yml @@ -65,7 +65,7 @@ jobs: php-version: ${{ matrix.php-versions }} # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation 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 - coverage: 'none' + coverage: none ini-file: development env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/integration-litmus.yml b/.github/workflows/integration-litmus.yml index 632f0febc53..61f9db6c28e 100644 --- a/.github/workflows/integration-litmus.yml +++ b/.github/workflows/integration-litmus.yml @@ -64,7 +64,7 @@ jobs: php-version: ${{ matrix.php-versions }} # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation 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 - coverage: 'none' + coverage: none ini-file: development env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/integration-s3-primary.yml b/.github/workflows/integration-s3-primary.yml index 42522d89f5d..2dfc3f5df33 100644 --- a/.github/workflows/integration-s3-primary.yml +++ b/.github/workflows/integration-s3-primary.yml @@ -88,7 +88,7 @@ jobs: php-version: ${{ matrix.php-versions }} # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation 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 - coverage: 'none' + coverage: none ini-file: development ini-values: disable_functions="" env: diff --git a/.github/workflows/object-storage-azure.yml b/.github/workflows/object-storage-azure.yml index 82701d6be38..231702033d5 100644 --- a/.github/workflows/object-storage-azure.yml +++ b/.github/workflows/object-storage-azure.yml @@ -55,10 +55,7 @@ jobs: strategy: fail-fast: false matrix: - php-versions: ['8.2', '8.3'] - include: - - php-versions: '8.4' - coverage: ${{ github.event_name != 'pull_request' }} + php-versions: ['8.2', '8.3', '8.4'] name: php${{ matrix.php-versions }}-azure @@ -91,7 +88,7 @@ jobs: php-version: ${{ matrix.php-versions }} # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation 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 - coverage: ${{ matrix.coverage && 'xdebug' || 'none' }} + coverage: none ini-file: development ini-values: disable_functions="" env: @@ -114,20 +111,7 @@ jobs: OBJECT_STORE: azure OBJECT_STORE_KEY: nextcloud OBJECT_STORE_SECRET: bmV4dGNsb3Vk - run: composer run test -- --group PRIMARY-azure --log-junit junit.xml ${{ matrix.coverage && '--coverage-clover ./clover.xml' || '' }} - - - name: Upload code coverage - if: ${{ !cancelled() && matrix.coverage }} - uses: codecov/codecov-action@e79a6962e0d4c0c17b229090214935d2e33f8354 # v6.0.1 - with: - files: ./clover.xml - flags: phpunit-azure - - - name: Upload test results - if: ${{ !cancelled() }} - uses: codecov/test-results-action@0fa95f0e1eeaafde2c782583b36b28ad0d8c77d3 # v1.2.1 - with: - flags: phpunit-azure + run: composer run test -- --group PRIMARY-azure --log-junit junit.xml - name: Azurite logs if: always() diff --git a/.github/workflows/object-storage-s3.yml b/.github/workflows/object-storage-s3.yml index f55dcf78e31..fb4c6ad2beb 100644 --- a/.github/workflows/object-storage-s3.yml +++ b/.github/workflows/object-storage-s3.yml @@ -55,10 +55,7 @@ jobs: strategy: fail-fast: false matrix: - php-versions: ['8.2'] - include: - - php-versions: '8.3' - coverage: ${{ github.event_name != 'pull_request' }} + php-versions: ['8.2', '8.3'] name: php${{ matrix.php-versions }}-s3 @@ -92,7 +89,7 @@ jobs: php-version: ${{ matrix.php-versions }} # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation 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 - coverage: ${{ matrix.coverage && 'xdebug' || 'none' }} + coverage: none ini-file: development ini-values: disable_functions="" env: @@ -119,20 +116,7 @@ jobs: OBJECT_STORE: s3 OBJECT_STORE_KEY: nextcloud OBJECT_STORE_SECRET: bWluaW8tc2VjcmV0LWtleS1uZXh0Y2xvdWQ= - run: composer run test -- --group PRIMARY-s3 --log-junit junit.xml ${{ matrix.coverage && '--coverage-clover ./clover.xml' || '' }} - - - name: Upload code coverage - if: ${{ !cancelled() && matrix.coverage }} - uses: codecov/codecov-action@e79a6962e0d4c0c17b229090214935d2e33f8354 # v6.0.1 - with: - files: ./clover.xml - flags: phpunit-s3 - - - name: Upload test results - if: ${{ !cancelled() }} - uses: codecov/test-results-action@0fa95f0e1eeaafde2c782583b36b28ad0d8c77d3 # v1.2.1 - with: - flags: phpunit-s3 + run: composer run test -- --group PRIMARY-s3 --log-junit junit.xml - name: S3 logs if: always() diff --git a/.github/workflows/object-storage-swift.yml b/.github/workflows/object-storage-swift.yml index f34f850cc14..b5ae9e3ead7 100644 --- a/.github/workflows/object-storage-swift.yml +++ b/.github/workflows/object-storage-swift.yml @@ -55,10 +55,7 @@ jobs: strategy: fail-fast: false matrix: - php-versions: ['8.2'] - include: - - php-versions: '8.3' - coverage: ${{ github.event_name != 'pull_request' }} + php-versions: ['8.2', '8.3'] name: php${{ matrix.php-versions }}-swift @@ -89,7 +86,7 @@ jobs: php-version: ${{ matrix.php-versions }} # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation 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 - coverage: ${{ matrix.coverage && 'xdebug' || 'none' }} + coverage: none ini-file: development ini-values: disable_functions="" env: @@ -110,20 +107,7 @@ jobs: env: OBJECT_STORE: swift OBJECT_STORE_SECRET: veryfast - run: composer run test -- --group PRIMARY-swift --log-junit junit.xml ${{ matrix.coverage && '--coverage-clover ./clover.xml' || '' }} - - - name: Upload code coverage - if: ${{ !cancelled() && matrix.coverage }} - uses: codecov/codecov-action@e79a6962e0d4c0c17b229090214935d2e33f8354 # v6.0.1 - with: - files: ./clover.xml - flags: phpunit-swift - - - name: Upload test results - if: ${{ !cancelled() }} - uses: codecov/test-results-action@0fa95f0e1eeaafde2c782583b36b28ad0d8c77d3 # v1.2.1 - with: - flags: phpunit-swift + run: composer run test -- --group PRIMARY-swift --log-junit junit.xml - name: Swift logs if: always() diff --git a/.github/workflows/phpunit-mariadb.yml b/.github/workflows/phpunit-mariadb.yml index b8b70029dc3..4f5c977c026 100644 --- a/.github/workflows/phpunit-mariadb.yml +++ b/.github/workflows/phpunit-mariadb.yml @@ -64,7 +64,6 @@ jobs: mariadb-versions: '10.6' - php-versions: '8.5' mariadb-versions: '11.8' - coverage: ${{ github.event_name != 'pull_request' }} name: MariaDB ${{ matrix.mariadb-versions }} (PHP ${{ matrix.php-versions }}) - database tests @@ -100,7 +99,7 @@ jobs: php-version: ${{ matrix.php-versions }} # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation extensions: bz2, ctype, curl, dom, fileinfo, gd, iconv, intl, json, libxml, mbstring, openssl, pcntl, posix, redis, session, simplexml, xmlreader, xmlwriter, zip, zlib, mysql, pdo_mysql - coverage: ${{ matrix.coverage && 'xdebug' || 'none' }} + coverage: none ini-file: development ini-values: disable_functions="" env: @@ -126,24 +125,11 @@ jobs: php -f tests/enable_all.php - name: PHPUnit - run: composer run test:db -- --log-junit junit.xml ${{ matrix.coverage && '--coverage-clover ./clover.db.xml' || '' }} + run: composer run test:db -- --log-junit junit.xml env: DB_ROOT_USER: root DB_ROOT_PASS: rootpassword - - name: Upload db code coverage - if: ${{ !cancelled() && matrix.coverage }} - uses: codecov/codecov-action@e79a6962e0d4c0c17b229090214935d2e33f8354 # v6.0.1 - with: - files: ./clover.db.xml - flags: phpunit-mariadb - - - name: Upload test results - if: ${{ !cancelled() }} - uses: codecov/test-results-action@0fa95f0e1eeaafde2c782583b36b28ad0d8c77d3 # v1.2.1 - with: - flags: phpunit-mariadb - summary: permissions: contents: none diff --git a/.github/workflows/phpunit-memcached.yml b/.github/workflows/phpunit-memcached.yml index 7aa42765fe9..eb974709163 100644 --- a/.github/workflows/phpunit-memcached.yml +++ b/.github/workflows/phpunit-memcached.yml @@ -56,10 +56,7 @@ jobs: strategy: fail-fast: false matrix: - php-versions: ['8.3', '8.4', '8.5'] - include: - - php-versions: '8.2' - coverage: ${{ github.event_name != 'pull_request' }} + php-versions: ['8.2', '8.3', '8.4', '8.5'] name: Memcached (PHP ${{ matrix.php-versions }}) @@ -84,7 +81,7 @@ jobs: php-version: ${{ matrix.php-versions }} # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation extensions: bz2, ctype, curl, dom, fileinfo, gd, iconv, intl, json, libxml, mbstring, memcached, openssl, pcntl, posix, redis, session, simplexml, xmlreader, xmlwriter, zip, zlib, sqlite, pdo_sqlite - coverage: ${{ matrix.coverage && 'xdebug' || 'none' }} + coverage: none ini-file: development ini-values: disable_functions="" env: @@ -102,20 +99,7 @@ jobs: php -f tests/enable_all.php - name: PHPUnit memcached tests - run: composer run test -- --group Memcache --group Memcached --log-junit junit.xml ${{ matrix.coverage && '--coverage-clover ./clover.xml' || '' }} - - - name: Upload code coverage - if: ${{ !cancelled() && matrix.coverage }} - uses: codecov/codecov-action@e79a6962e0d4c0c17b229090214935d2e33f8354 # v6.0.1 - with: - files: ./clover.xml - flags: phpunit-memcached - - - name: Upload test results - if: ${{ !cancelled() }} - uses: codecov/test-results-action@0fa95f0e1eeaafde2c782583b36b28ad0d8c77d3 # v1.2.1 - with: - flags: phpunit-memcached + run: composer run test -- --group Memcache --group Memcached --log-junit junit.xml - name: Print logs if: always() diff --git a/.github/workflows/phpunit-mysql-sharding.yml b/.github/workflows/phpunit-mysql-sharding.yml index 204b151b92e..b6f0773c053 100644 --- a/.github/workflows/phpunit-mysql-sharding.yml +++ b/.github/workflows/phpunit-mysql-sharding.yml @@ -133,7 +133,7 @@ jobs: php-version: ${{ matrix.php-versions }} # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation extensions: bz2, ctype, curl, dom, fileinfo, gd, iconv, intl, json, libxml, mbstring, openssl, pcntl, posix, redis, session, simplexml, xmlreader, xmlwriter, zip, zlib, mysql, pdo_mysql - coverage: ${{ matrix.coverage && 'xdebug' || 'none' }} + coverage: none ini-file: development ini-values: disable_functions="" env: @@ -160,20 +160,7 @@ jobs: php -f tests/enable_all.php - name: PHPUnit - run: composer run test:db -- --log-junit junit.xml ${{ matrix.coverage && '--coverage-clover ./clover.db.xml' || '' }} - - - name: Upload db code coverage - if: ${{ !cancelled() && matrix.coverage }} - uses: codecov/codecov-action@e79a6962e0d4c0c17b229090214935d2e33f8354 # v6.0.1 - with: - files: ./clover.db.xml - flags: phpunit-mysql - - - name: Upload test results - if: ${{ !cancelled() }} - uses: codecov/test-results-action@0fa95f0e1eeaafde2c782583b36b28ad0d8c77d3 # v1.2.1 - with: - flags: phpunit-mysql + run: composer run test:db -- --log-junit junit.xml - name: Print logs if: always() diff --git a/.github/workflows/phpunit-mysql.yml b/.github/workflows/phpunit-mysql.yml index a0f4a3f3136..f5f10649f70 100644 --- a/.github/workflows/phpunit-mysql.yml +++ b/.github/workflows/phpunit-mysql.yml @@ -64,7 +64,6 @@ jobs: php-versions: '8.2' - mysql-versions: '8.4' php-versions: '8.5' - coverage: ${{ github.event_name != 'pull_request' }} name: MySQL ${{ matrix.mysql-versions }} (PHP ${{ matrix.php-versions }}) - database tests @@ -100,7 +99,7 @@ jobs: php-version: ${{ matrix.php-versions }} # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation extensions: bz2, ctype, curl, dom, fileinfo, gd, iconv, intl, json, libxml, mbstring, openssl, pcntl, posix, redis, session, simplexml, xmlreader, xmlwriter, zip, zlib, mysql, pdo_mysql - coverage: ${{ matrix.coverage && 'xdebug' || 'none' }} + coverage: none ini-file: development ini-values: disable_functions="" env: @@ -126,24 +125,11 @@ jobs: php -f tests/enable_all.php - name: PHPUnit - run: composer run test:db -- --log-junit junit.xml ${{ matrix.coverage && '--coverage-clover ./clover.db.xml' || '' }} + run: composer run test:db -- --log-junit junit.xml env: DB_ROOT_USER: root DB_ROOT_PASS: rootpassword - - name: Upload db code coverage - if: ${{ !cancelled() && matrix.coverage }} - uses: codecov/codecov-action@e79a6962e0d4c0c17b229090214935d2e33f8354 # v6.0.1 - with: - files: ./clover.db.xml - flags: phpunit-mysql - - - name: Upload test results - if: ${{ !cancelled() }} - uses: codecov/test-results-action@0fa95f0e1eeaafde2c782583b36b28ad0d8c77d3 # v1.2.1 - with: - flags: phpunit-mysql - - name: Print logs if: always() run: | diff --git a/.github/workflows/phpunit-nodb.yml b/.github/workflows/phpunit-nodb.yml index 3504d356875..39c5d423526 100644 --- a/.github/workflows/phpunit-nodb.yml +++ b/.github/workflows/phpunit-nodb.yml @@ -59,10 +59,7 @@ jobs: strategy: fail-fast: false matrix: - php-versions: ["8.3", "8.4", "8.5"] - include: - - php-versions: "8.2" - coverage: ${{ github.event_name != 'pull_request' }} + php-versions: ["8.2", "8.3", "8.4", "8.5"] name: No DB unit tests (PHP ${{ matrix.php-versions }}) @@ -87,7 +84,7 @@ jobs: php-version: ${{ matrix.php-versions }} # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation extensions: apcu, bz2, ctype, curl, dom, fileinfo, gd, iconv, imagick, intl, json, libxml, mbstring, openssl, pcntl, pdo_sqlite, posix, redis, session, simplexml, sqlite, xmlreader, xmlwriter, zip, zlib - coverage: ${{ matrix.coverage && 'xdebug' || 'none' }} + coverage: none ini-file: development # Required for tests that use pcntl ini-values: disable_functions="" @@ -107,20 +104,7 @@ jobs: php -f tests/enable_all.php - name: PHPUnit nodb testsuite - run: composer run test -- --exclude-group DB --exclude-group SLOWDB --exclude-group Memcached --exclude-group PRIMARY-swift --exclude-group PRIMARY-s3 --exclude-group PRIMARY-azure --log-junit junit.xml ${{ matrix.coverage && '--coverage-clover ./clover.nodb.xml' || '' }} - - - name: Upload nodb code coverage - if: ${{ !cancelled() && matrix.coverage }} - uses: codecov/codecov-action@e79a6962e0d4c0c17b229090214935d2e33f8354 # v6.0.1 - with: - files: ./clover.nodb.xml - flags: phpunit-nodb - - - name: Upload test results - if: ${{ !cancelled() }} - uses: codecov/test-results-action@0fa95f0e1eeaafde2c782583b36b28ad0d8c77d3 # v1.2.1 - with: - flags: phpunit-nodb + run: composer run test -- --exclude-group DB --exclude-group SLOWDB --exclude-group Memcached --exclude-group PRIMARY-swift --exclude-group PRIMARY-s3 --exclude-group PRIMARY-azure --log-junit junit.xml - name: Print logs if: always() diff --git a/.github/workflows/phpunit-oci.yml b/.github/workflows/phpunit-oci.yml index 2e524df428f..1941e23c2e1 100644 --- a/.github/workflows/phpunit-oci.yml +++ b/.github/workflows/phpunit-oci.yml @@ -64,7 +64,6 @@ jobs: php-versions: '8.2' - oracle-versions: '23' php-versions: '8.5' - coverage: ${{ github.event_name != 'pull_request' }} name: Oracle ${{ matrix.oracle-versions }} (PHP ${{ matrix.php-versions }}) - database tests @@ -107,7 +106,7 @@ jobs: php-version: ${{ matrix.php-versions }} # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation extensions: bz2, ctype, curl, dom, fileinfo, gd, iconv, intl, json, libxml, mbstring, openssl, pcntl, posix, redis, session, simplexml, xmlreader, xmlwriter, zip, zlib, oci8 - coverage: ${{ matrix.coverage && 'xdebug' || 'none' }} + coverage: none ini-file: development ini-values: disable_functions="" env: @@ -126,20 +125,7 @@ jobs: php -f tests/enable_all.php - name: PHPUnit - run: composer run test:db -- --log-junit junit.xml ${{ matrix.coverage && '--coverage-clover ./clover.db.xml' || '' }} - - - name: Upload db code coverage - if: ${{ !cancelled() && matrix.coverage }} - uses: codecov/codecov-action@e79a6962e0d4c0c17b229090214935d2e33f8354 # v6.0.1 - with: - files: ./clover.db.xml - flags: phpunit-oci - - - name: Upload test results - if: ${{ !cancelled() }} - uses: codecov/test-results-action@0fa95f0e1eeaafde2c782583b36b28ad0d8c77d3 # v1.2.1 - with: - flags: phpunit-oci + run: composer run test:db -- --log-junit junit.xml - name: Run repair steps run: | diff --git a/.github/workflows/phpunit-pgsql.yml b/.github/workflows/phpunit-pgsql.yml index 789ac9ff0d5..6fb8f67f55f 100644 --- a/.github/workflows/phpunit-pgsql.yml +++ b/.github/workflows/phpunit-pgsql.yml @@ -68,7 +68,6 @@ jobs: postgres-versions: '18' - php-versions: '8.5' postgres-versions: '18' - coverage: ${{ github.event_name != 'pull_request' }} name: PostgreSQL ${{ matrix.postgres-versions }} (PHP ${{ matrix.php-versions }}) - database tests @@ -103,7 +102,7 @@ jobs: php-version: ${{ matrix.php-versions }} # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation extensions: bz2, ctype, curl, dom, fileinfo, gd, iconv, intl, json, libxml, mbstring, openssl, pcntl, posix, redis, session, simplexml, xmlreader, xmlwriter, zip, zlib, pgsql, pdo_pgsql - coverage: ${{ matrix.coverage && 'xdebug' || 'none' }} + coverage: none ini-file: development ini-values: disable_functions="" env: @@ -124,20 +123,7 @@ jobs: php -f tests/enable_all.php - name: PHPUnit database tests - run: composer run test:db -- --log-junit junit.xml ${{ matrix.coverage && '--coverage-clover ./clover.db.xml' || '' }} - - - name: Upload db code coverage - if: ${{ !cancelled() && matrix.coverage }} - uses: codecov/codecov-action@e79a6962e0d4c0c17b229090214935d2e33f8354 # v6.0.1 - with: - files: ./clover.db.xml - flags: phpunit-postgres - - - name: Upload test results - if: ${{ !cancelled() }} - uses: codecov/test-results-action@0fa95f0e1eeaafde2c782583b36b28ad0d8c77d3 # v1.2.1 - with: - flags: phpunit-postgres + run: composer run test:db -- --log-junit junit.xml - name: Run repair steps run: | diff --git a/.github/workflows/phpunit-sqlite.yml b/.github/workflows/phpunit-sqlite.yml index 0ff8a56e5a1..cc817a84391 100644 --- a/.github/workflows/phpunit-sqlite.yml +++ b/.github/workflows/phpunit-sqlite.yml @@ -59,9 +59,7 @@ jobs: strategy: fail-fast: false matrix: - include: - - php-versions: '8.5' - coverage: ${{ github.event_name != 'pull_request' }} + php-versions: ['8.5'] name: SQLite (PHP ${{ matrix.php-versions }}) @@ -86,7 +84,7 @@ jobs: php-version: ${{ matrix.php-versions }} # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation extensions: bz2, ctype, curl, dom, fileinfo, gd, iconv, imagick, intl, json, libxml, mbstring, openssl, pcntl, posix, redis, session, simplexml, xmlreader, xmlwriter, zip, zlib, sqlite, pdo_sqlite - coverage: ${{ matrix.coverage && 'xdebug' || 'none' }} + coverage: none ini-file: development ini-values: disable_functions="" env: @@ -111,20 +109,7 @@ jobs: run: ./occ app:list && echo "======= System config =======" && ./occ config:list system - name: PHPUnit database tests - run: composer run test:db -- --log-junit junit.xml ${{ matrix.coverage && '--coverage-clover ./clover.db.xml' || '' }} - - - name: Upload db code coverage - if: ${{ !cancelled() && matrix.coverage }} - uses: codecov/codecov-action@e79a6962e0d4c0c17b229090214935d2e33f8354 # v6.0.1 - with: - files: ./clover.db.xml - flags: phpunit-sqlite - - - name: Upload test results - if: ${{ !cancelled() }} - uses: codecov/test-results-action@0fa95f0e1eeaafde2c782583b36b28ad0d8c77d3 # v1.2.1 - with: - flags: phpunit-sqlite + run: composer run test:db -- --log-junit junit.xml - name: Print logs if: always() From 3ee06f338ceb9db1e197bbd1dd453a18fe8c8ee3 Mon Sep 17 00:00:00 2001 From: provokateurin Date: Wed, 10 Jun 2026 16:38:49 +0200 Subject: [PATCH 2/2] 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');