Skip to content

Commit 6507116

Browse files
artongeartonge
authored
Merge pull request #61335 from nextcloud/fix/remove-phpunit-coverage-in-stable34
[stable34] chore(ci): Remove code coverage from stable branches
2 parents 80da1a8 + 93c0b9c commit 6507116

15 files changed

Lines changed: 48 additions & 169 deletions

‎.github/workflows/files-external-ftp.yml‎

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,6 @@ jobs:
5757
matrix:
5858
php-versions: ['8.2', '8.4']
5959
ftpd: ['proftpd', 'vsftpd', 'pure-ftpd']
60-
include:
61-
- php-versions: '8.2'
62-
coverage: ${{ github.event_name != 'pull_request' }}
6360

6461
name: php${{ matrix.php-versions }}-${{ matrix.ftpd }}
6562

@@ -87,7 +84,7 @@ jobs:
8784
php-version: ${{ matrix.php-versions }}
8885
# https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
8986
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
90-
coverage: ${{ matrix.coverage && 'xdebug' || 'none' }}
87+
coverage: none
9188
env:
9289
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
9390

@@ -110,15 +107,7 @@ jobs:
110107
- name: PHPUnit
111108
run: composer run test:files_external -- \
112109
apps/files_external/tests/Storage/FtpTest.php \
113-
--log-junit junit.xml \
114-
${{ matrix.coverage && '--coverage-clover ./clover.xml' || '' }}
115-
116-
- name: Upload code coverage
117-
if: ${{ !cancelled() && matrix.coverage }}
118-
uses: codecov/codecov-action@57e3a136b779b570ffcdbf80b3bdc90e7fab3de2 # v6.0.0
119-
with:
120-
files: ./clover.xml
121-
flags: phpunit-files-external-ftp
110+
--log-junit junit.xml
122111

123112
- name: Upload test results
124113
if: ${{ !cancelled() }}

‎.github/workflows/files-external-s3.yml‎

Lines changed: 4 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,6 @@ jobs:
5656
fail-fast: false
5757
matrix:
5858
php-versions: ['8.2', '8.4']
59-
include:
60-
- php-versions: '8.3'
61-
coverage: ${{ github.event_name != 'pull_request' }}
6259

6360
name: php${{ matrix.php-versions }}-s3-minio
6461

@@ -86,7 +83,7 @@ jobs:
8683
php-version: ${{ matrix.php-versions }}
8784
# https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
8885
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
89-
coverage: ${{ matrix.coverage && 'xdebug' || 'none' }}
86+
coverage: none
9087
ini-file: development
9188
ini-values: disable_functions=""
9289
env:
@@ -111,15 +108,7 @@ jobs:
111108
composer run test:files_external -- \
112109
--group S3 \
113110
--log-junit junit.xml \
114-
apps/files_external/tests/Storage \
115-
${{ matrix.coverage && '--coverage-clover ./clover.xml' || '' }}
116-
117-
- name: Upload code coverage
118-
if: ${{ !cancelled() && matrix.coverage }}
119-
uses: codecov/codecov-action@57e3a136b779b570ffcdbf80b3bdc90e7fab3de2 # v6.0.0
120-
with:
121-
files: ./clover.xml
122-
flags: phpunit-files-external-s3
111+
apps/files_external/tests/Storage
123112
124113
- name: Upload test results
125114
if: ${{ !cancelled() }}
@@ -147,9 +136,6 @@ jobs:
147136
strategy:
148137
matrix:
149138
php-versions: ['8.2', '8.4']
150-
include:
151-
- php-versions: '8.3'
152-
coverage: ${{ github.event_name != 'pull_request' }}
153139

154140
name: php${{ matrix.php-versions }}-s3-localstack
155141

@@ -176,7 +162,7 @@ jobs:
176162
php-version: ${{ matrix.php-versions }}
177163
# https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
178164
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
179-
coverage: ${{ matrix.coverage && 'xdebug' || 'none' }}
165+
coverage: none
180166
ini-file: development
181167
ini-values: disable_functions=""
182168
env:
@@ -194,15 +180,7 @@ jobs:
194180
composer run test:files_external -- \
195181
--group S3 \
196182
--log-junit junit.xml \
197-
apps/files_external/tests/Storage \
198-
${{ matrix.coverage && '--coverage-clover ./clover.xml' || '' }}
199-
200-
- name: Upload code coverage
201-
if: ${{ !cancelled() && matrix.coverage }}
202-
uses: codecov/codecov-action@57e3a136b779b570ffcdbf80b3bdc90e7fab3de2 # v6.0.0
203-
with:
204-
files: ./clover.xml
205-
flags: phpunit-files-external-s3
183+
apps/files_external/tests/Storage
206184
207185
- name: Upload test results
208186
if: ${{ !cancelled() }}

‎.github/workflows/files-external-sftp.yml‎

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,6 @@ jobs:
5757
matrix:
5858
php-versions: ['8.2', '8.4']
5959
sftpd: ['openssh']
60-
include:
61-
- php-versions: '8.2'
62-
coverage: ${{ github.event_name != 'pull_request' }}
6360

6461
name: php${{ matrix.php-versions }}-${{ matrix.sftpd }}
6562

@@ -83,7 +80,7 @@ jobs:
8380
php-version: ${{ matrix.php-versions }}
8481
# https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
8582
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
86-
coverage: ${{ matrix.coverage && 'xdebug' || 'none' }}
83+
coverage: none
8784
env:
8885
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
8986

@@ -99,15 +96,7 @@ jobs:
9996
run: composer run test:files_external -- \
10097
apps/files_external/tests/Storage/SftpTest.php \
10198
apps/files_external/tests/Storage/SFTP_KeyTest.php \
102-
--log-junit junit.xml \
103-
${{ matrix.coverage && '--coverage-clover ./clover.xml' || '' }}
104-
105-
- name: Upload code coverage
106-
if: ${{ !cancelled() && matrix.coverage }}
107-
uses: codecov/codecov-action@57e3a136b779b570ffcdbf80b3bdc90e7fab3de2 # v6.0.0
108-
with:
109-
files: ./clover.xml
110-
flags: phpunit-files-external-sftp
99+
--log-junit junit.xml
111100

112101
- name: Upload test results
113102
if: ${{ !cancelled() }}

‎.github/workflows/files-external-smb.yml‎

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ jobs:
5757
matrix:
5858
include:
5959
- php-versions: '8.2'
60-
coverage: ${{ github.event_name != 'pull_request' }}
6160

6261
name: php${{ matrix.php-versions }}-smb
6362

@@ -87,7 +86,7 @@ jobs:
8786
php-version: ${{ matrix.php-versions }}
8887
# https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
8988
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
90-
coverage: ${{ matrix.coverage && 'xdebug' || 'none' }}
89+
coverage: none
9190
ini-file: development
9291
ini-values: disable_functions=""
9392
env:
@@ -112,15 +111,7 @@ jobs:
112111
- name: PHPUnit
113112
run: composer run test:files_external -- \
114113
apps/files_external/tests/Storage/SmbTest.php \
115-
--log-junit junit.xml \
116-
${{ matrix.coverage && '--coverage-clover ./clover.xml' || '' }}
117-
118-
- name: Upload code coverage
119-
if: ${{ !cancelled() && matrix.coverage }}
120-
uses: codecov/codecov-action@57e3a136b779b570ffcdbf80b3bdc90e7fab3de2 # v6.0.0
121-
with:
122-
files: ./clover.xml
123-
flags: phpunit-files-external-smb
114+
--log-junit junit.xml
124115

125116
- name: Upload test results
126117
if: ${{ !cancelled() }}

‎.github/workflows/files-external-webdav.yml‎

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,7 @@ jobs:
5555
strategy:
5656
fail-fast: false
5757
matrix:
58-
php-versions: ['8.3', '8.4']
59-
include:
60-
- php-versions: '8.2'
61-
coverage: ${{ github.event_name != 'pull_request' }}
58+
php-versions: ['8.2', '8.4']
6259

6360
name: php${{ matrix.php-versions }}-webdav
6461

@@ -82,7 +79,7 @@ jobs:
8279
php-version: ${{ matrix.php-versions }}
8380
# https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
8481
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
85-
coverage: ${{ matrix.coverage && 'xdebug' || 'none' }}
82+
coverage: none
8683
ini-file: development
8784
ini-values: disable_functions=""
8885
env:
@@ -104,15 +101,7 @@ jobs:
104101
- name: PHPUnit
105102
run: composer run test:files_external -- \
106103
apps/files_external/tests/Storage/WebdavTest.php \
107-
--log-junit junit.xml \
108-
${{ matrix.coverage && '--coverage-clover ./clover.xml' || '' }}
109-
110-
- name: Upload code coverage
111-
if: ${{ !cancelled() && matrix.coverage }}
112-
uses: codecov/codecov-action@57e3a136b779b570ffcdbf80b3bdc90e7fab3de2 # v6.0.0
113-
with:
114-
files: ./clover.xml
115-
flags: phpunit-files-external-webdav
104+
--log-junit junit.xml
116105

117106
- name: Upload test results
118107
if: ${{ !cancelled() }}

‎.github/workflows/files-external.yml‎

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,7 @@ jobs:
5555
strategy:
5656
fail-fast: false
5757
matrix:
58-
php-versions: ['8.3', '8.4']
59-
include:
60-
- php-versions: '8.2'
61-
coverage: ${{ github.event_name != 'pull_request' }}
58+
php-versions: ['8.2', '8.4']
6259

6360
name: php${{ matrix.php-versions }}-generic
6461

@@ -76,7 +73,7 @@ jobs:
7673
php-version: ${{ matrix.php-versions }}
7774
# https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
7875
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
79-
coverage: ${{ matrix.coverage && 'xdebug' || 'none' }}
76+
coverage: none
8077
ini-file: development
8178
ini-values: disable_functions=""
8279
env:
@@ -93,15 +90,7 @@ jobs:
9390
9491
- name: PHPUnit
9592
run: composer run test:files_external -- \
96-
--log-junit junit.xml \
97-
${{ matrix.coverage && '--coverage-clover ./clover.xml' || '' }}
98-
99-
- name: Upload code coverage
100-
if: ${{ !cancelled() && matrix.coverage }}
101-
uses: codecov/codecov-action@57e3a136b779b570ffcdbf80b3bdc90e7fab3de2 # v6.0.0
102-
with:
103-
files: ./clover.xml
104-
flags: phpunit-files-external-generic
93+
--log-junit junit.xml
10594

10695
- name: Upload test results
10796
if: ${{ !cancelled() }}

‎.github/workflows/object-storage-azure.yml‎

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,7 @@ jobs:
5555
strategy:
5656
fail-fast: false
5757
matrix:
58-
php-versions: ['8.2', '8.3']
59-
include:
60-
- php-versions: '8.4'
61-
coverage: ${{ github.event_name != 'pull_request' }}
58+
php-versions: ['8.2', '8.4']
6259

6360
name: php${{ matrix.php-versions }}-azure
6461

@@ -91,7 +88,7 @@ jobs:
9188
php-version: ${{ matrix.php-versions }}
9289
# https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
9390
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
94-
coverage: ${{ matrix.coverage && 'xdebug' || 'none' }}
91+
coverage: none
9592
ini-file: development
9693
ini-values: disable_functions=""
9794
env:
@@ -114,14 +111,7 @@ jobs:
114111
OBJECT_STORE: azure
115112
OBJECT_STORE_KEY: nextcloud
116113
OBJECT_STORE_SECRET: bmV4dGNsb3Vk
117-
run: composer run test -- --group PRIMARY-azure --log-junit junit.xml ${{ matrix.coverage && '--coverage-clover ./clover.xml' || '' }}
118-
119-
- name: Upload code coverage
120-
if: ${{ !cancelled() && matrix.coverage }}
121-
uses: codecov/codecov-action@57e3a136b779b570ffcdbf80b3bdc90e7fab3de2 # v6.0.0
122-
with:
123-
files: ./clover.xml
124-
flags: phpunit-azure
114+
run: composer run test -- --group PRIMARY-azure --log-junit junit.xml
125115

126116
- name: Upload test results
127117
if: ${{ !cancelled() }}

‎.github/workflows/object-storage-s3.yml‎

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,7 @@ jobs:
5555
strategy:
5656
fail-fast: false
5757
matrix:
58-
php-versions: ['8.2']
59-
include:
60-
- php-versions: '8.3'
61-
coverage: ${{ github.event_name != 'pull_request' }}
58+
php-versions: ['8.2', '8.4']
6259

6360
name: php${{ matrix.php-versions }}-s3
6461

@@ -92,7 +89,7 @@ jobs:
9289
php-version: ${{ matrix.php-versions }}
9390
# https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
9491
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
95-
coverage: ${{ matrix.coverage && 'xdebug' || 'none' }}
92+
coverage: none
9693
ini-file: development
9794
ini-values: disable_functions=""
9895
env:
@@ -119,14 +116,7 @@ jobs:
119116
OBJECT_STORE: s3
120117
OBJECT_STORE_KEY: nextcloud
121118
OBJECT_STORE_SECRET: bWluaW8tc2VjcmV0LWtleS1uZXh0Y2xvdWQ=
122-
run: composer run test -- --group PRIMARY-s3 --log-junit junit.xml ${{ matrix.coverage && '--coverage-clover ./clover.xml' || '' }}
123-
124-
- name: Upload code coverage
125-
if: ${{ !cancelled() && matrix.coverage }}
126-
uses: codecov/codecov-action@57e3a136b779b570ffcdbf80b3bdc90e7fab3de2 # v6.0.0
127-
with:
128-
files: ./clover.xml
129-
flags: phpunit-s3
119+
run: composer run test -- --group PRIMARY-s3 --log-junit junit.xml
130120

131121
- name: Upload test results
132122
if: ${{ !cancelled() }}

‎.github/workflows/object-storage-swift.yml‎

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,7 @@ jobs:
5555
strategy:
5656
fail-fast: false
5757
matrix:
58-
php-versions: ['8.2']
59-
include:
60-
- php-versions: '8.3'
61-
coverage: ${{ github.event_name != 'pull_request' }}
58+
php-versions: ['8.2', '8.4']
6259

6360
name: php${{ matrix.php-versions }}-swift
6461

@@ -89,7 +86,7 @@ jobs:
8986
php-version: ${{ matrix.php-versions }}
9087
# https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
9188
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
92-
coverage: ${{ matrix.coverage && 'xdebug' || 'none' }}
89+
coverage: none
9390
ini-file: development
9491
ini-values: disable_functions=""
9592
env:
@@ -110,14 +107,7 @@ jobs:
110107
env:
111108
OBJECT_STORE: swift
112109
OBJECT_STORE_SECRET: veryfast
113-
run: composer run test -- --group PRIMARY-swift --log-junit junit.xml ${{ matrix.coverage && '--coverage-clover ./clover.xml' || '' }}
114-
115-
- name: Upload code coverage
116-
if: ${{ !cancelled() && matrix.coverage }}
117-
uses: codecov/codecov-action@57e3a136b779b570ffcdbf80b3bdc90e7fab3de2 # v6.0.0
118-
with:
119-
files: ./clover.xml
120-
flags: phpunit-swift
110+
run: composer run test -- --group PRIMARY-swift --log-junit junit.xml
121111

122112
- name: Upload test results
123113
if: ${{ !cancelled() }}

‎.github/workflows/phpunit-mariadb.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ jobs:
9999
php-version: ${{ matrix.php-versions }}
100100
# https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
101101
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
102-
coverage: ${{ matrix.coverage && 'xdebug' || 'none' }}
102+
coverage: none
103103
ini-file: development
104104
ini-values: disable_functions=""
105105
env:

0 commit comments

Comments
 (0)