Skip to content

Commit 8068366

Browse files
miaulalalamiaulalala
committed
Merge remote-tracking branch 'origin/stable33' into backport/60198/stable33
Signed-off-by: Anna Larch <anna@nextcloud.com> # Conflicts: # dist/theming-settings-admin.css # dist/theming-settings-admin.mjs # dist/theming-settings-admin.mjs.map
2 parents 9be7cb8 + 5500dc1 commit 8068366

2,439 files changed

Lines changed: 40726 additions & 21334 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.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@671740ac38dd9b0130fbe1cec585b89eea48d3de # v5.5.2
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
env:
9289
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -110,15 +107,7 @@ jobs:
110107
composer run test:files_external -- \
111108
--group S3 \
112109
--log-junit junit.xml \
113-
apps/files_external/tests/Storage \
114-
${{ matrix.coverage && '--coverage-clover ./clover.xml' || '' }}
115-
116-
- name: Upload code coverage
117-
if: ${{ !cancelled() && matrix.coverage }}
118-
uses: codecov/codecov-action@671740ac38dd9b0130fbe1cec585b89eea48d3de # v5.5.2
119-
with:
120-
files: ./clover.xml
121-
flags: phpunit-files-external-s3
110+
apps/files_external/tests/Storage
122111
123112
- name: Upload test results
124113
if: ${{ !cancelled() }}
@@ -146,9 +135,6 @@ jobs:
146135
strategy:
147136
matrix:
148137
php-versions: ['8.2', '8.4']
149-
include:
150-
- php-versions: '8.3'
151-
coverage: ${{ github.event_name != 'pull_request' }}
152138

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

@@ -175,7 +161,7 @@ jobs:
175161
php-version: ${{ matrix.php-versions }}
176162
# https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
177163
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
178-
coverage: ${{ matrix.coverage && 'xdebug' || 'none' }}
164+
coverage: none
179165
ini-file: development
180166
env:
181167
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -192,15 +178,7 @@ jobs:
192178
composer run test:files_external -- \
193179
--group S3 \
194180
--log-junit junit.xml \
195-
apps/files_external/tests/Storage \
196-
${{ matrix.coverage && '--coverage-clover ./clover.xml' || '' }}
197-
198-
- name: Upload code coverage
199-
if: ${{ !cancelled() && matrix.coverage }}
200-
uses: codecov/codecov-action@671740ac38dd9b0130fbe1cec585b89eea48d3de # v5.5.2
201-
with:
202-
files: ./clover.xml
203-
flags: phpunit-files-external-s3
181+
apps/files_external/tests/Storage
204182
205183
- name: Upload test results
206184
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@671740ac38dd9b0130fbe1cec585b89eea48d3de # v5.5.2
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
env:
9392
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -111,15 +110,7 @@ jobs:
111110
- name: PHPUnit
112111
run: composer run test:files_external -- \
113112
apps/files_external/tests/Storage/SmbTest.php \
114-
--log-junit junit.xml \
115-
${{ matrix.coverage && '--coverage-clover ./clover.xml' || '' }}
116-
117-
- name: Upload code coverage
118-
if: ${{ !cancelled() && matrix.coverage }}
119-
uses: codecov/codecov-action@671740ac38dd9b0130fbe1cec585b89eea48d3de # v5.5.2
120-
with:
121-
files: ./clover.xml
122-
flags: phpunit-files-external-smb
113+
--log-junit junit.xml
123114

124115
- name: Upload test results
125116
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
env:
8885
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -103,15 +100,7 @@ jobs:
103100
- name: PHPUnit
104101
run: composer run test:files_external -- \
105102
apps/files_external/tests/Storage/WebdavTest.php \
106-
--log-junit junit.xml \
107-
${{ matrix.coverage && '--coverage-clover ./clover.xml' || '' }}
108-
109-
- name: Upload code coverage
110-
if: ${{ !cancelled() && matrix.coverage }}
111-
uses: codecov/codecov-action@671740ac38dd9b0130fbe1cec585b89eea48d3de # v5.5.2
112-
with:
113-
files: ./clover.xml
114-
flags: phpunit-files-external-webdav
103+
--log-junit junit.xml
115104

116105
- name: Upload test results
117106
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
env:
8279
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -92,15 +89,7 @@ jobs:
9289
9390
- name: PHPUnit
9491
run: composer run test:files_external -- \
95-
--log-junit junit.xml \
96-
${{ matrix.coverage && '--coverage-clover ./clover.xml' || '' }}
97-
98-
- name: Upload code coverage
99-
if: ${{ !cancelled() && matrix.coverage }}
100-
uses: codecov/codecov-action@671740ac38dd9b0130fbe1cec585b89eea48d3de # v5.5.2
101-
with:
102-
files: ./clover.xml
103-
flags: phpunit-files-external-generic
92+
--log-junit junit.xml
10493

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

‎.github/workflows/generate-release-changelog.yml‎

Lines changed: 0 additions & 104 deletions
This file was deleted.

‎.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
env:
9794
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -113,14 +110,7 @@ jobs:
113110
OBJECT_STORE: azure
114111
OBJECT_STORE_KEY: nextcloud
115112
OBJECT_STORE_SECRET: bmV4dGNsb3Vk
116-
run: composer run test -- --group PRIMARY-azure --log-junit junit.xml ${{ matrix.coverage && '--coverage-clover ./clover.xml' || '' }}
117-
118-
- name: Upload code coverage
119-
if: ${{ !cancelled() && matrix.coverage }}
120-
uses: codecov/codecov-action@671740ac38dd9b0130fbe1cec585b89eea48d3de # v5.5.2
121-
with:
122-
files: ./clover.xml
123-
flags: phpunit-azure
113+
run: composer run test -- --group PRIMARY-azure --log-junit junit.xml
124114

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

0 commit comments

Comments
 (0)