Skip to content

Commit d65a175

Browse files
SystemKeeperSystemKeeper
committed
chore: Adapt workflows for stable34
Assisted-by: ClaudeCode:claude-opus-5 Signed-off-by: Marcel Müller <marcel-mueller@gmx.de>
1 parent 63edf4e commit d65a175

14 files changed

Lines changed: 109 additions & 73 deletions

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
strategy:
1717
fail-fast: false
1818
matrix:
19-
php-versions: ['8.3', '8.5']
19+
php-versions: ['8.2', '8.4']
2020
backend: ['generic', 'proftpd', 'vsftpd', 'pure-ftpd', 's3-minio', 's3-localstack', 'openssh', 'smb', 'webdav']
2121

2222
name: php${{ matrix.php-versions }}-${{ matrix.backend }}
@@ -166,6 +166,12 @@ jobs:
166166
- name: PHPUnit
167167
run: composer run test:files_external -- --log-junit junit.xml $TEST_ARGS
168168

169+
- name: Upload test results
170+
if: ${{ !cancelled() }}
171+
uses: codecov/test-results-action@0fa95f0e1eeaafde2c782583b36b28ad0d8c77d3 # v1.2.1
172+
with:
173+
flags: phpunit-files-external-${{ matrix.backend }}
174+
169175
- name: Nextcloud logs
170176
if: always()
171177
run: |

‎.github/workflows/integration-s3-primary.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
strategy:
1717
fail-fast: false
1818
matrix:
19-
php-versions: ['8.3', '8.5']
19+
php-versions: ['8.2']
2020
key: ['objectstore', 'objectstore_multibucket']
2121

2222
name: php${{ matrix.php-versions }}-${{ matrix.key }}-minio
@@ -50,7 +50,7 @@ jobs:
5050
php-version: ${{ matrix.php-versions }}
5151
# https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
5252
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
53-
coverage: none
53+
coverage: 'none'
5454
ini-file: development
5555
ini-values: disable_functions=""
5656
env:

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
strategy:
1717
fail-fast: false
1818
matrix:
19-
php-versions: ['8.3', '8.5']
19+
php-versions: ['8.2', '8.4']
2020

2121
name: php${{ matrix.php-versions }}-azure
2222

@@ -74,6 +74,12 @@ jobs:
7474
OBJECT_STORE_SECRET: bmV4dGNsb3Vk
7575
run: composer run test -- --group PRIMARY-azure --log-junit junit.xml
7676

77+
- name: Upload test results
78+
if: ${{ !cancelled() }}
79+
uses: codecov/test-results-action@0fa95f0e1eeaafde2c782583b36b28ad0d8c77d3 # v1.2.1
80+
with:
81+
flags: phpunit-azure
82+
7783
- name: Azurite logs
7884
if: always()
7985
run: |

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
strategy:
1717
fail-fast: false
1818
matrix:
19-
php-versions: ['8.3', '8.5']
19+
php-versions: ['8.2', '8.4']
2020

2121
name: php${{ matrix.php-versions }}-s3
2222

@@ -79,6 +79,12 @@ jobs:
7979
OBJECT_STORE_SECRET: bWluaW8tc2VjcmV0LWtleS1uZXh0Y2xvdWQ=
8080
run: composer run test -- --group PRIMARY-s3 --log-junit junit.xml
8181

82+
- name: Upload test results
83+
if: ${{ !cancelled() }}
84+
uses: codecov/test-results-action@0fa95f0e1eeaafde2c782583b36b28ad0d8c77d3 # v1.2.1
85+
with:
86+
flags: phpunit-s3
87+
8288
- name: S3 logs
8389
if: always()
8490
run: |

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
strategy:
1717
fail-fast: false
1818
matrix:
19-
php-versions: ['8.3', '8.5']
19+
php-versions: ['8.2', '8.4']
2020

2121
name: php${{ matrix.php-versions }}-swift
2222

@@ -70,6 +70,12 @@ jobs:
7070
OBJECT_STORE_SECRET: veryfast
7171
run: composer run test -- --group PRIMARY-swift --log-junit junit.xml
7272

73+
- name: Upload test results
74+
if: ${{ !cancelled() }}
75+
uses: codecov/test-results-action@0fa95f0e1eeaafde2c782583b36b28ad0d8c77d3 # v1.2.1
76+
with:
77+
flags: phpunit-swift
78+
7379
- name: Swift logs
7480
if: always()
7581
run: |

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

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ jobs:
2121
strategy:
2222
fail-fast: false
2323
matrix:
24+
php-versions: ['8.2']
25+
mariadb-versions: ['10.6']
2426
include:
25-
- mariadb-versions: '10.11'
26-
php-versions: '8.3'
27-
- mariadb-versions: '12.3'
28-
php-versions: '8.5'
27+
- php-versions: '8.5'
28+
mariadb-versions: '11.8'
2929

3030
name: MariaDB ${{ matrix.mariadb-versions }} (PHP ${{ matrix.php-versions }}) - database tests
3131

@@ -65,7 +65,6 @@ jobs:
6565
ini-file: development
6666
ini-values: disable_functions=""
6767
env:
68-
fail-fast: true
6968
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
7069

7170
- name: Set up dependencies
@@ -91,3 +90,9 @@ jobs:
9190
env:
9291
DB_ROOT_USER: root
9392
DB_ROOT_PASS: rootpassword
93+
94+
- name: Upload test results
95+
if: ${{ !cancelled() }}
96+
uses: codecov/test-results-action@0fa95f0e1eeaafde2c782583b36b28ad0d8c77d3 # v1.2.1
97+
with:
98+
flags: phpunit-mariadb

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
strategy:
2222
fail-fast: false
2323
matrix:
24-
php-versions: ["8.3", "8.5"]
24+
php-versions: ["8.2", "8.5"]
2525

2626
name: Memcached (PHP ${{ matrix.php-versions }})
2727

@@ -49,7 +49,6 @@ jobs:
4949
ini-file: development
5050
ini-values: disable_functions=""
5151
env:
52-
fail-fast: true
5352
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
5453

5554
- name: Set up dependencies
@@ -66,6 +65,12 @@ jobs:
6665
- name: PHPUnit memcached tests
6766
run: composer run test -- --group Memcached --log-junit junit.xml
6867

68+
- name: Upload test results
69+
if: ${{ !cancelled() }}
70+
uses: codecov/test-results-action@0fa95f0e1eeaafde2c782583b36b28ad0d8c77d3 # v1.2.1
71+
with:
72+
flags: phpunit-memcached
73+
6974
- name: Print logs
7075
if: always()
7176
run: |

‎.github/workflows/phpunit-mysql-sharding.yml‎

Lines changed: 13 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,8 @@ jobs:
2121
strategy:
2222
fail-fast: false
2323
matrix:
24-
include:
25-
- mysql-versions: '8.4'
26-
php-versions: '8.3'
27-
- mysql-versions: '9.7'
28-
php-versions: '8.5'
24+
php-versions: ['8.2']
25+
mysql-versions: ['8.4']
2926

3027
name: Sharding - MySQL ${{ matrix.mysql-versions }} (PHP ${{ matrix.php-versions }}) - database tests
3128

@@ -37,7 +34,7 @@ jobs:
3734
options: --health-cmd="redis-cli ping" --health-interval=10s --health-timeout=5s --health-retries=3
3835

3936
mysql:
40-
image: mysql:${{ matrix.mysql-versions }} # zizmor: ignore[unpinned-images]
37+
image: ghcr.io/nextcloud/continuous-integration-mysql-${{ matrix.mysql-versions }}:latest # zizmor: ignore[unpinned-images]
4138
ports:
4239
- 4444:3306/tcp
4340
env:
@@ -47,7 +44,7 @@ jobs:
4744
MYSQL_DATABASE: oc_autotest
4845
options: --health-cmd="mysqladmin ping" --health-interval 5s --health-timeout 2s --health-retries 10
4946
shard1:
50-
image: mysql:${{ matrix.mysql-versions }} # zizmor: ignore[unpinned-images]
47+
image: ghcr.io/nextcloud/continuous-integration-mysql-${{ matrix.mysql-versions }}:latest # zizmor: ignore[unpinned-images]
5148
ports:
5249
- 5001:3306/tcp
5350
env:
@@ -57,7 +54,7 @@ jobs:
5754
MYSQL_DATABASE: nextcloud
5855
options: --health-cmd="mysqladmin ping" --health-interval 5s --health-timeout 2s --health-retries 10
5956
shard2:
60-
image: mysql:${{ matrix.mysql-versions }} # zizmor: ignore[unpinned-images]
57+
image: ghcr.io/nextcloud/continuous-integration-mysql-${{ matrix.mysql-versions }}:latest # zizmor: ignore[unpinned-images]
6158
ports:
6259
- 5002:3306/tcp
6360
env:
@@ -67,7 +64,7 @@ jobs:
6764
MYSQL_DATABASE: nextcloud
6865
options: --health-cmd="mysqladmin ping" --health-interval 5s --health-timeout 2s --health-retries 10
6966
shard3:
70-
image: mysql:${{ matrix.mysql-versions }} # zizmor: ignore[unpinned-images]
67+
image: ghcr.io/nextcloud/continuous-integration-mysql-${{ matrix.mysql-versions }}:latest # zizmor: ignore[unpinned-images]
7168
ports:
7269
- 5003:3306/tcp
7370
env:
@@ -77,7 +74,7 @@ jobs:
7774
MYSQL_DATABASE: nextcloud
7875
options: --health-cmd="mysqladmin ping" --health-interval 5s --health-timeout 2s --health-retries 10
7976
shard4:
80-
image: mysql:${{ matrix.mysql-versions }} # zizmor: ignore[unpinned-images]
77+
image: ghcr.io/nextcloud/continuous-integration-mysql-${{ matrix.mysql-versions }}:latest # zizmor: ignore[unpinned-images]
8178
ports:
8279
- 5004:3306/tcp
8380
env:
@@ -105,7 +102,6 @@ jobs:
105102
ini-file: development
106103
ini-values: disable_functions=""
107104
env:
108-
fail-fast: true
109105
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
110106

111107
- name: Set up dependencies
@@ -116,13 +112,6 @@ jobs:
116112
echo "SET GLOBAL sql_mode=(SELECT CONCAT(@@sql_mode,',ONLY_FULL_GROUP_BY'));" | mysql -h 127.0.0.1 -P 4444 -u root -prootpassword
117113
echo "SELECT @@sql_mode;" | mysql -h 127.0.0.1 -P 4444 -u root -prootpassword
118114
119-
- name: Enable MD5 MySQL support
120-
if: matrix.mysql-versions == '9.7'
121-
run: |
122-
for MYSQL_PORT in 4444 5001 5002 5003 5004; do
123-
echo "INSTALL COMPONENT 'file://component_classic_hashing';" | mysql -h 127.0.0.1 -P $MYSQL_PORT -u root -prootpassword
124-
done
125-
126115
- name: Set up Nextcloud
127116
env:
128117
DB_PORT: 4444
@@ -137,6 +126,12 @@ jobs:
137126
- name: PHPUnit
138127
run: composer run test:db -- --log-junit junit.xml
139128

129+
- name: Upload test results
130+
if: ${{ !cancelled() }}
131+
uses: codecov/test-results-action@0fa95f0e1eeaafde2c782583b36b28ad0d8c77d3 # v1.2.1
132+
with:
133+
flags: phpunit-mysql
134+
140135
- name: Print logs
141136
if: always()
142137
run: |

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

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ jobs:
2121
strategy:
2222
fail-fast: false
2323
matrix:
24+
php-versions: ['8.2']
25+
mysql-versions: ['8.0']
2426
include:
2527
- mysql-versions: '8.4'
26-
php-versions: '8.3'
27-
- mysql-versions: '9.7'
2828
php-versions: '8.5'
2929

3030
name: MySQL ${{ matrix.mysql-versions }} (PHP ${{ matrix.php-versions }}) - database tests
@@ -37,7 +37,7 @@ jobs:
3737
options: --health-cmd="redis-cli ping" --health-interval=10s --health-timeout=5s --health-retries=3
3838

3939
mysql:
40-
image: mysql:${{ matrix.mysql-versions }} # zizmor: ignore[unpinned-images]
40+
image: ghcr.io/nextcloud/continuous-integration-mysql-${{ matrix.mysql-versions }}:latest # zizmor: ignore[unpinned-images]
4141
ports:
4242
- 4444:3306/tcp
4343
env:
@@ -61,11 +61,10 @@ jobs:
6161
php-version: ${{ matrix.php-versions }}
6262
# https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
6363
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
64-
coverage: none
64+
coverage: 'none'
6565
ini-file: development
6666
ini-values: disable_functions=""
6767
env:
68-
fail-fast: true
6968
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
7069

7170
- name: Set up dependencies
@@ -92,6 +91,12 @@ jobs:
9291
DB_ROOT_USER: root
9392
DB_ROOT_PASS: rootpassword
9493

94+
- name: Upload test results
95+
if: ${{ !cancelled() }}
96+
uses: codecov/test-results-action@0fa95f0e1eeaafde2c782583b36b28ad0d8c77d3 # v1.2.1
97+
with:
98+
flags: phpunit-mysql
99+
95100
- name: Print logs
96101
if: always()
97102
run: |

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

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,9 @@ jobs:
2323
strategy:
2424
fail-fast: false
2525
matrix:
26-
php-versions: ['8.3', '8.5']
26+
php-versions: ['8.3', '8.4', '8.5']
27+
include:
28+
- php-versions: '8.2'
2729

2830
name: No DB unit tests (PHP ${{ matrix.php-versions }})
2931

@@ -47,13 +49,12 @@ jobs:
4749
with:
4850
php-version: ${{ matrix.php-versions }}
4951
# https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
50-
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
51-
coverage: none
52+
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
53+
coverage: 'none'
5254
ini-file: development
5355
# Required for tests that use pcntl
5456
ini-values: disable_functions=""
5557
env:
56-
fail-fast: true
5758
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
5859

5960
- name: Set up dependencies
@@ -68,7 +69,13 @@ jobs:
6869
php -f tests/enable_all.php
6970
7071
- name: PHPUnit nodb testsuite
71-
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
72+
run: composer run test -- --exclude-group DB --exclude-group SLOWDB --log-junit junit.xml
73+
74+
- name: Upload test results
75+
if: ${{ !cancelled() }}
76+
uses: codecov/test-results-action@0fa95f0e1eeaafde2c782583b36b28ad0d8c77d3 # v1.2.1
77+
with:
78+
flags: phpunit-nodb
7279

7380
- name: Print logs
7481
if: always()

0 commit comments

Comments
 (0)