Skip to content

Commit 692f5f3

Browse files
provokateurinprovokateurin
authored
Merge pull request #61158 from nextcloud/ci/php/versions
ci(PHP): Only test against highest and lowest supported PHP versions
2 parents e99befd + 3ee06f3 commit 692f5f3

28 files changed

Lines changed: 84 additions & 385 deletions

‎.github/workflows/autocheckers.yml‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,6 @@ jobs:
4444
needs: changes
4545
if: needs.changes.outputs.src != 'false'
4646

47-
strategy:
48-
matrix:
49-
php-versions: ['8.2']
50-
5147
name: PHP checkers
5248

5349
steps:
@@ -57,11 +53,11 @@ jobs:
5753
persist-credentials: false
5854
submodules: true
5955

60-
- name: Set up php ${{ matrix.php-versions }}
56+
- name: Set up php
6157
uses: shivammathur/setup-php@7c071dfe9dc99bdf297fa79cb49ea005b9fcadbc #v2.37.1
6258
timeout-minutes: 5
6359
with:
64-
php-version: ${{ matrix.php-versions }}
60+
php-version: '8.2'
6561
extensions: bz2, ctype, curl, dom, fileinfo, gd, iconv, intl, json, libxml, mbstring, openssl, pcntl, posix, session, simplexml, xmlreader, xmlwriter, zip, zlib, sqlite, pdo_sqlite
6662
coverage: none
6763
ini-file: development
@@ -77,10 +73,6 @@ jobs:
7773
needs: changes
7874
if: needs.changes.outputs.src != 'false'
7975

80-
strategy:
81-
matrix:
82-
php-versions: ['8.2']
83-
8476
name: Translation and Files checkers
8577

8678
steps:
@@ -90,11 +82,11 @@ jobs:
9082
persist-credentials: false
9183
submodules: true
9284

93-
- name: Set up php ${{ matrix.php-versions }}
85+
- name: Set up php
9486
uses: shivammathur/setup-php@7c071dfe9dc99bdf297fa79cb49ea005b9fcadbc #v2.37.1
9587
timeout-minutes: 5
9688
with:
97-
php-version: ${{ matrix.php-versions }}
89+
php-version: '8.2'
9890
extensions: bz2, ctype, curl, dom, fileinfo, gd, iconv, intl, json, libxml, mbstring, openssl, pcntl, posix, session, simplexml, xmlreader, xmlwriter, zip, zlib, sqlite, pdo_sqlite
9991
coverage: none
10092
ini-file: development

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

Lines changed: 3 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,8 @@ jobs:
5555
strategy:
5656
fail-fast: false
5757
matrix:
58-
php-versions: ['8.2', '8.4']
58+
php-versions: ['8.2', '8.5']
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,21 +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@e79a6962e0d4c0c17b229090214935d2e33f8354 # v6.0.1
119-
with:
120-
files: ./clover.xml
121-
flags: phpunit-files-external-ftp
122-
123-
- name: Upload test results
124-
if: ${{ !cancelled() }}
125-
uses: codecov/test-results-action@0fa95f0e1eeaafde2c782583b36b28ad0d8c77d3 # v1.2.1
126-
with:
127-
flags: phpunit-files-external-ftp
110+
--log-junit junit.xml
128111

129112
- name: ftpd logs
130113
if: always()

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

Lines changed: 6 additions & 40 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.4']
59-
include:
60-
- php-versions: '8.3'
61-
coverage: ${{ github.event_name != 'pull_request' }}
58+
php-versions: ['8.2', '8.5']
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,21 +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@e79a6962e0d4c0c17b229090214935d2e33f8354 # v6.0.1
120-
with:
121-
files: ./clover.xml
122-
flags: phpunit-files-external-s3
123-
124-
- name: Upload test results
125-
if: ${{ !cancelled() }}
126-
uses: codecov/test-results-action@0fa95f0e1eeaafde2c782583b36b28ad0d8c77d3 # v1.2.1
127-
with:
128-
flags: phpunit-files-external-s3
111+
apps/files_external/tests/Storage
129112
130113
- name: Nextcloud logs
131114
if: always()
@@ -146,10 +129,7 @@ jobs:
146129

147130
strategy:
148131
matrix:
149-
php-versions: ['8.2', '8.4']
150-
include:
151-
- php-versions: '8.3'
152-
coverage: ${{ github.event_name != 'pull_request' }}
132+
php-versions: ['8.2', '8.5']
153133

154134
name: php${{ matrix.php-versions }}-s3-localstack
155135

@@ -176,7 +156,7 @@ jobs:
176156
php-version: ${{ matrix.php-versions }}
177157
# https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
178158
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' }}
159+
coverage: none
180160
ini-file: development
181161
ini-values: disable_functions=""
182162
env:
@@ -194,21 +174,7 @@ jobs:
194174
composer run test:files_external -- \
195175
--group S3 \
196176
--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@e79a6962e0d4c0c17b229090214935d2e33f8354 # v6.0.1
203-
with:
204-
files: ./clover.xml
205-
flags: phpunit-files-external-s3
206-
207-
- name: Upload test results
208-
if: ${{ !cancelled() }}
209-
uses: codecov/test-results-action@0fa95f0e1eeaafde2c782583b36b28ad0d8c77d3 # v1.2.1
210-
with:
211-
flags: phpunit-files-external-s3
177+
apps/files_external/tests/Storage
212178
213179
- name: S3 logs
214180
if: always()

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

Lines changed: 3 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,8 @@ jobs:
5555
strategy:
5656
fail-fast: false
5757
matrix:
58-
php-versions: ['8.2', '8.4']
58+
php-versions: ['8.2', '8.5']
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

@@ -98,21 +95,7 @@ jobs:
9895
- name: PHPUnit
9996
run: composer run test:files_external -- \
10097
apps/files_external/tests/Storage/SftpTest.php \
101-
--log-junit junit.xml \
102-
${{ matrix.coverage && '--coverage-clover ./clover.xml' || '' }}
103-
104-
- name: Upload code coverage
105-
if: ${{ !cancelled() && matrix.coverage }}
106-
uses: codecov/codecov-action@e79a6962e0d4c0c17b229090214935d2e33f8354 # v6.0.1
107-
with:
108-
files: ./clover.xml
109-
flags: phpunit-files-external-sftp
110-
111-
- name: Upload test results
112-
if: ${{ !cancelled() }}
113-
uses: codecov/test-results-action@0fa95f0e1eeaafde2c782583b36b28ad0d8c77d3 # v1.2.1
114-
with:
115-
flags: phpunit-files-external-sftp
98+
--log-junit junit.xml
11699

117100
- name: sftpd logs
118101
if: always()

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

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

6260
name: php${{ matrix.php-versions }}-smb
6361

@@ -87,7 +85,7 @@ jobs:
8785
php-version: ${{ matrix.php-versions }}
8886
# https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
8987
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' }}
88+
coverage: none
9189
ini-file: development
9290
ini-values: disable_functions=""
9391
env:
@@ -114,21 +112,7 @@ jobs:
114112
- name: PHPUnit
115113
run: composer run test:files_external -- \
116114
apps/files_external/tests/Storage/SmbTest.php \
117-
--log-junit junit.xml \
118-
${{ matrix.coverage && '--coverage-clover ./clover.xml' || '' }}
119-
120-
- name: Upload code coverage
121-
if: ${{ !cancelled() && matrix.coverage }}
122-
uses: codecov/codecov-action@e79a6962e0d4c0c17b229090214935d2e33f8354 # v6.0.1
123-
with:
124-
files: ./clover.xml
125-
flags: phpunit-files-external-smb
126-
127-
- name: Upload test results
128-
if: ${{ !cancelled() }}
129-
uses: codecov/test-results-action@0fa95f0e1eeaafde2c782583b36b28ad0d8c77d3 # v1.2.1
130-
with:
131-
flags: phpunit-files-external-smb
115+
--log-junit junit.xml
132116

133117
files-external-smb-summary:
134118
runs-on: ubuntu-latest-low

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

Lines changed: 3 additions & 20 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.5']
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,21 +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@e79a6962e0d4c0c17b229090214935d2e33f8354 # v6.0.1
113-
with:
114-
files: ./clover.xml
115-
flags: phpunit-files-external-webdav
116-
117-
- name: Upload test results
118-
if: ${{ !cancelled() }}
119-
uses: codecov/test-results-action@0fa95f0e1eeaafde2c782583b36b28ad0d8c77d3 # v1.2.1
120-
with:
121-
flags: phpunit-files-external-webdav
104+
--log-junit junit.xml
122105

123106
files-external-webdav-summary:
124107
runs-on: ubuntu-latest-low

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

Lines changed: 3 additions & 20 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.5']
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,21 +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@e79a6962e0d4c0c17b229090214935d2e33f8354 # v6.0.1
102-
with:
103-
files: ./clover.xml
104-
flags: phpunit-files-external-generic
105-
106-
- name: Upload test results
107-
if: ${{ !cancelled() }}
108-
uses: codecov/test-results-action@0fa95f0e1eeaafde2c782583b36b28ad0d8c77d3 # v1.2.1
109-
with:
110-
flags: phpunit-files-external-generic
93+
--log-junit junit.xml
11194

11295
files-external-summary:
11396
runs-on: ubuntu-latest-low

‎.github/workflows/integration-dav.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
strategy:
4646
fail-fast: false
4747
matrix:
48-
php-versions: ['8.2']
48+
php-versions: ['8.2', '8.5']
4949
endpoint: ['old', 'new']
5050
service: ['CalDAV', 'CardDAV']
5151

@@ -65,7 +65,7 @@ jobs:
6565
php-version: ${{ matrix.php-versions }}
6666
# https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
6767
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
68-
coverage: 'none'
68+
coverage: none
6969
ini-file: development
7070
env:
7171
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/integration-litmus.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
strategy:
4646
fail-fast: false
4747
matrix:
48-
php-versions: ['8.2']
48+
php-versions: ['8.2', '8.5']
4949
endpoint: ['webdav', 'dav']
5050

5151
name: Litmus WebDAV ${{ matrix.endpoint }}
@@ -64,7 +64,7 @@ jobs:
6464
php-version: ${{ matrix.php-versions }}
6565
# https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
6666
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
67-
coverage: 'none'
67+
coverage: none
6868
ini-file: development
6969
env:
7070
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

0 commit comments

Comments
 (0)