Skip to content

Commit 904a5e3

Browse files
Merge branch 'master' into feature/db-diagnostics
2 parents 729e1e6 + 1b1c74e commit 904a5e3

5,598 files changed

Lines changed: 103191 additions & 60286 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/CODEOWNERS

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ package.json @nextcloud/server-dependabot @next
2424
package-lock.json @nextcloud/server-dependabot
2525

2626
# App maintainers
27-
/apps/admin_audit/appinfo/info.xml @luka-nextcloud @blizzz
27+
/apps/admin_audit/appinfo/info.xml @luka-nextcloud @samin-z
2828
/apps/cloud_federation_api/appinfo/info.xml @nfebe @mejo-
2929
/apps/comments/appinfo/info.xml @edward-ly @sorbaugh
3030
/apps/contactsinteraction/appinfo/info.xml @kesselb @SebastianKrupinski
@@ -46,16 +46,16 @@ package-lock.json @nextcloud/server-dependabot
4646
/apps/files_versions/appinfo/info.xml @artonge @icewind1991
4747
/apps/oauth2/appinfo/info.xml @julien-nc @ChristophWurst
4848
/apps/provisioning_api/appinfo/info.xml @provokateurin @nickvergessen
49-
/apps/settings/appinfo/info.xml @JuliaKirschenheuter @sorbaugh
49+
/apps/settings/appinfo/info.xml @hweihwang @sorbaugh
5050
/apps/sharebymail/appinfo/info.xml @Altahrim @skjnldsv
5151
/apps/systemtags/appinfo/info.xml @Antreesy @marcelklehr
5252
/apps/theming/appinfo/info.xml @skjnldsv @juliusknorr
5353
/apps/twofactor_backupcodes/appinfo/info.xml @miaulalala @ChristophWurst
54-
/apps/updatenotification/appinfo/info.xml @JuliaKirschenheuter @sorbaugh
54+
/apps/updatenotification/appinfo/info.xml @enjeck @sorbaugh
5555
/apps/user_ldap/appinfo/info.xml @come-nc @blizzz
5656
/apps/user_status/appinfo/info.xml @Antreesy @nickvergessen
5757
/apps/weather_status/appinfo/info.xml @julien-nc @juliusknorr
58-
/apps/webhook_listeners/appinfo/info.xml @come-nc @julien-nc
58+
/apps/webhook_listeners/appinfo/info.xml @janepie @julien-nc
5959
/apps/workflowengine/appinfo/info.xml @blizzz @juliusknorr
6060

6161
# Files frontend expertise

.github/ISSUE_TEMPLATE/BUG_REPORT.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,8 @@ body:
7373
options:
7474
- "32"
7575
- "33"
76-
- "34 (master)"
76+
- "34"
77+
- "35 (master)"
7778
validations:
7879
required: true
7980
- type: dropdown

.github/dependabot.yml

Lines changed: 61 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,14 @@ updates:
5353
- "feature: dependencies"
5454
# Disable automatic rebasing because without a build CI will likely fail anyway
5555
rebase-strategy: "disabled"
56+
cooldown:
57+
default-days: 4
58+
semver-major-days: 8
5659
groups:
60+
eslint:
61+
patterns:
62+
- "eslint*"
63+
- "@nextcloud/eslint-config"
5764
vite:
5865
patterns:
5966
- "vite"
@@ -67,7 +74,7 @@ updates:
6774

6875
# Composer dependencies for linting and testing
6976
- package-ecosystem: composer
70-
target-branch: stable33
77+
target-branch: stable34
7178
directories:
7279
- "/"
7380
- "/vendor-bin/behat"
@@ -91,7 +98,7 @@ updates:
9198

9299
# frontend dependencies
93100
- package-ecosystem: npm
94-
target-branch: stable33
101+
target-branch: stable34
95102
directories:
96103
- "/"
97104
- "/build/frontend"
@@ -101,6 +108,9 @@ updates:
101108
day: saturday
102109
time: "03:30"
103110
timezone: Europe/Paris
111+
cooldown:
112+
default-days: 4
113+
semver-major-days: 8
104114
open-pull-requests-limit: 20
105115
labels:
106116
- "3. to review"
@@ -123,6 +133,52 @@ updates:
123133

124134
# Older stable releases
125135

136+
# Composer dependencies for linting and testing
137+
- package-ecosystem: composer
138+
target-branch: stable33
139+
directories:
140+
- "/"
141+
- "/vendor-bin/behat"
142+
- "/vendor-bin/cs-fixer"
143+
- "/vendor-bin/openapi-extractor"
144+
- "/vendor-bin/phpunit"
145+
- "/vendor-bin/psalm"
146+
schedule:
147+
interval: weekly
148+
day: saturday
149+
time: "04:30"
150+
timezone: Europe/Paris
151+
labels:
152+
- "3. to review"
153+
- "feature: dependencies"
154+
ignore:
155+
# only patch updates on stable branches
156+
- dependency-name: "*"
157+
update-types: ["version-update:semver-major", "version-update:semver-minor"]
158+
159+
# frontend dependencies
160+
- package-ecosystem: npm
161+
target-branch: stable33
162+
directory: "/"
163+
schedule:
164+
interval: weekly
165+
day: saturday
166+
time: "04:30"
167+
timezone: Europe/Paris
168+
cooldown:
169+
default-days: 4
170+
semver-major-days: 8
171+
open-pull-requests-limit: 20
172+
labels:
173+
- "3. to review"
174+
- "feature: dependencies"
175+
# Disable automatic rebasing because without a build CI will likely fail anyway
176+
rebase-strategy: "disabled"
177+
ignore:
178+
# no major updates on stable branches
179+
- dependency-name: "*"
180+
update-types: ["version-update:semver-major"]
181+
126182
# Composer dependencies for linting and testing
127183
- package-ecosystem: composer
128184
target-branch: stable32
@@ -155,6 +211,9 @@ updates:
155211
day: saturday
156212
time: "04:30"
157213
timezone: Europe/Paris
214+
cooldown:
215+
default-days: 4
216+
semver-major-days: 8
158217
open-pull-requests-limit: 20
159218
labels:
160219
- "3. to review"

.github/workflows/autocheckers.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
src: ${{ steps.changes.outputs.src }}
2121

2222
steps:
23-
- uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2
23+
- uses: dorny/paths-filter@fbd0ab8f3e69293af611ebaee6363fc25e6d187d # v4.0.1
2424
id: changes
2525
continue-on-error: true
2626
with:
@@ -58,7 +58,7 @@ jobs:
5858
submodules: true
5959

6060
- name: Set up php ${{ matrix.php-versions }}
61-
uses: shivammathur/setup-php@44454db4f0199b8b9685a5d763dc37cbf79108e1 #v2.36.0
61+
uses: shivammathur/setup-php@7c071dfe9dc99bdf297fa79cb49ea005b9fcadbc #v2.37.1
6262
timeout-minutes: 5
6363
with:
6464
php-version: ${{ matrix.php-versions }}
@@ -74,6 +74,9 @@ jobs:
7474
autocheckers:
7575
runs-on: ubuntu-latest-low
7676

77+
needs: changes
78+
if: needs.changes.outputs.src != 'false'
79+
7780
strategy:
7881
matrix:
7982
php-versions: ['8.2']
@@ -88,7 +91,7 @@ jobs:
8891
submodules: true
8992

9093
- name: Set up php ${{ matrix.php-versions }}
91-
uses: shivammathur/setup-php@44454db4f0199b8b9685a5d763dc37cbf79108e1 #v2.36.0
94+
uses: shivammathur/setup-php@7c071dfe9dc99bdf297fa79cb49ea005b9fcadbc #v2.37.1
9295
timeout-minutes: 5
9396
with:
9497
php-version: ${{ matrix.php-versions }}
@@ -125,4 +128,4 @@ jobs:
125128

126129
steps:
127130
- name: Summary status
128-
run: if ${{ needs.autocheckers.result != 'success' || (needs.changes.outputs.src != 'false' && needs.autoloader.result != 'success') }}; then exit 1; fi
131+
run: if ${{ needs.changes.outputs.src != 'false' && (needs.autocheckers.result != 'success' || needs.autoloader.result != 'success') }}; then exit 1; fi

.github/workflows/block-merge-eol.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727

2828
steps:
2929
- name: Set server major version environment
30-
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
30+
uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
3131
with:
3232
github-token: ${{secrets.GITHUB_TOKEN}}
3333
script: |

.github/workflows/block-merge-freeze.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929

3030
steps:
3131
- name: Register server reference to fallback to master branch
32-
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
32+
uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
3333
with:
3434
github-token: ${{secrets.GITHUB_TOKEN}}
3535
script: |

.github/workflows/block-outdated-3rdparty.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121

2222
steps:
2323
- name: Check requirement
24-
uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2
24+
uses: dorny/paths-filter@fbd0ab8f3e69293af611ebaee6363fc25e6d187d # v4.0.1
2525
id: changes
2626
continue-on-error: true
2727
with:
@@ -41,7 +41,7 @@ jobs:
4141
echo "commit=$(git submodule status | grep ' 3rdparty' | egrep -o '[a-f0-9]{40}')" >> "$GITHUB_OUTPUT"
4242
4343
- name: Register server reference to fallback to master branch
44-
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
44+
uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
4545
with:
4646
github-token: ${{secrets.GITHUB_TOKEN}}
4747
script: |

.github/workflows/block-unconventional-commits.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,6 @@ jobs:
3131
with:
3232
persist-credentials: false
3333

34-
- uses: webiny/action-conventional-commits@faccb24fc2550dd15c0390d944379d2d8ed9690e # v1.3.1
34+
- uses: webiny/action-conventional-commits@7f91b1595ca1951cdb671ddc9f07a49081ec5b69 # v1.4.2
3535
with:
3636
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/bug-report-labeler.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
issues: write
1515
steps:
1616
- name: Extract version number and apply label
17-
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
17+
uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
1818
with:
1919
script: |
2020
const body = context.payload.issue.body || '';

.github/workflows/codeql.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,13 @@ jobs:
3737
persist-credentials: false
3838

3939
- name: Initialize CodeQL
40-
uses: github/codeql-action/init@89a39a4e59826350b863aa6b6252a07ad50cf83e # v4.32.4
40+
uses: github/codeql-action/init@68bde559dea0fdcac2102bfdf6230c5f70eb485e # v4.35.4
4141
with:
4242
languages: ${{ matrix.language }}
4343
build-mode: ${{ matrix.build-mode }}
4444
config-file: ./.github/codeql-config.yml
4545

4646
- name: Perform CodeQL Analysis
47-
uses: github/codeql-action/analyze@89a39a4e59826350b863aa6b6252a07ad50cf83e # v4.32.4
47+
uses: github/codeql-action/analyze@68bde559dea0fdcac2102bfdf6230c5f70eb485e # v4.35.4
4848
with:
4949
category: "/language:${{matrix.language}}"

0 commit comments

Comments
 (0)