Skip to content

Commit 3d0234b

Browse files
authored
Merge branch 'master' into 54088-providePermissionsAndOwnerIdInPut
Signed-off-by: John Molakvoæ <skjnldsv@users.noreply.github.com>
2 parents 1018198 + e01440a commit 3d0234b

3,528 files changed

Lines changed: 44172 additions & 39103 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/ISSUE_TEMPLATE/BUG_REPORT.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ body:
7373
options:
7474
- "32"
7575
- "33"
76-
- "master"
76+
- "34 (master)"
7777
validations:
7878
required: true
7979
- type: dropdown

.github/dependabot.yml

Lines changed: 0 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -165,46 +165,3 @@ updates:
165165
# no major updates on stable branches
166166
- dependency-name: "*"
167167
update-types: ["version-update:semver-major"]
168-
169-
# Composer dependencies for linting and testing
170-
- package-ecosystem: composer
171-
target-branch: stable31
172-
directories:
173-
- "/"
174-
- "/build/integration"
175-
- "/vendor-bin/cs-fixer"
176-
- "/vendor-bin/openapi-extractor"
177-
- "/vendor-bin/phpunit"
178-
- "/vendor-bin/psalm"
179-
schedule:
180-
interval: weekly
181-
day: saturday
182-
time: "04:00"
183-
timezone: Europe/Paris
184-
labels:
185-
- "3. to review"
186-
- "feature: dependencies"
187-
ignore:
188-
# only patch updates on stable branches
189-
- dependency-name: "*"
190-
update-types: ["version-update:semver-major", "version-update:semver-minor"]
191-
192-
# frontend dependencies
193-
- package-ecosystem: npm
194-
target-branch: stable31
195-
directory: "/"
196-
schedule:
197-
interval: weekly
198-
day: saturday
199-
time: "04:00"
200-
timezone: Europe/Paris
201-
open-pull-requests-limit: 20
202-
labels:
203-
- "3. to review"
204-
- "feature: dependencies"
205-
# Disable automatic rebasing because without a build CI will likely fail anyway
206-
rebase-strategy: "disabled"
207-
ignore:
208-
# no major updates on stable branches
209-
- dependency-name: "*"
210-
update-types: ["version-update:semver-major"]

.github/pull_request_template.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,7 @@
2323
- [ ] [Backports requested](https://github.com/nextcloud/backportbot/#usage) where applicable (ex: critical bugfixes)
2424
- [ ] [Labels added](https://github.com/nextcloud/server/labels) where applicable (ex: bug/enhancement, `3. to review`, feature component)
2525
- [ ] [Milestone added](https://github.com/nextcloud/server/milestones) for target branch/version (ex: 32.x for `stable32`)
26+
27+
## AI (if applicable)
28+
29+
- [ ] The content of this PR was partly or fully generated using AI
Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
# SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors
2+
# SPDX-License-Identifier: AGPL-3.0-or-later
3+
4+
name: Auto-label bug reports
5+
on:
6+
issues:
7+
types: [opened]
8+
9+
jobs:
10+
add-version-label:
11+
if: contains(github.event.issue.title, '[Bug]')
12+
runs-on: ubuntu-latest
13+
permissions:
14+
issues: write
15+
steps:
16+
- name: Extract version number and apply label
17+
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
18+
with:
19+
script: |
20+
const body = context.payload.issue.body || '';
21+
const normalizedBody = body.replace(/\r\n?/g, '\n');
22+
let label = '';
23+
24+
// Extract Nextcloud Server version number from a block like:
25+
// ### Nextcloud Server version
26+
// 32
27+
const versionMatch = normalizedBody.match(/### Nextcloud Server version\s*\n+([0-9]{1,3})\b/);
28+
let nextcloudVersion = null;
29+
if (versionMatch) {
30+
nextcloudVersion = parseInt(versionMatch[1], 10);
31+
label = nextcloudVersion + '-feedback';
32+
}
33+
34+
if (label) {
35+
try {
36+
await github.rest.issues.addLabels({
37+
issue_number: context.issue.number,
38+
owner: context.repo.owner,
39+
repo: context.repo.repo,
40+
labels: [label]
41+
});
42+
} catch (error) {
43+
core.setFailed(`Failed to add label "${label}": ${error.message || error}`);
44+
}
45+
}

.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@b20883b0cd1f46c72ae0ba6d1090936928f9fa30 # v4.32.0
40+
uses: github/codeql-action/init@89a39a4e59826350b863aa6b6252a07ad50cf83e # v4.32.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@b20883b0cd1f46c72ae0ba6d1090936928f9fa30 # v4.32.0
47+
uses: github/codeql-action/analyze@89a39a4e59826350b863aa6b6252a07ad50cf83e # v4.32.4
4848
with:
4949
category: "/language:${{matrix.language}}"

.github/workflows/cypress.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ jobs:
171171
run: ./node_modules/cypress/bin/cypress install
172172

173173
- name: Run ${{ matrix.containers == 'component' && 'component' || 'E2E' }} cypress tests
174-
uses: cypress-io/github-action@0f330ebf0d60f87608ed72f1d6232e5644aa3171 # v7.1.1
174+
uses: cypress-io/github-action@bc22e01685c56e89e7813fd8e26f33dc47f87e15 # v7.1.5
175175
with:
176176
# We already installed the dependencies in the init job
177177
install: false
@@ -195,7 +195,7 @@ jobs:
195195
SETUP_TESTING: ${{ matrix.containers == 'setup' && 'true' || '' }}
196196

197197
- name: Upload snapshots and videos
198-
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
198+
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
199199
if: always()
200200
with:
201201
name: snapshots_${{ matrix.containers }}
@@ -218,7 +218,7 @@ jobs:
218218
run: docker exec nextcloud-e2e-test-server_${{ env.APP_NAME }} tar -cvjf - data > data.tar
219219

220220
- name: Upload data archive
221-
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
221+
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
222222
if: failure() && matrix.containers != 'component'
223223
with:
224224
name: nc_data_${{ matrix.containers }}

.github/workflows/integration-dav.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ jobs:
7171
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
7272

7373
- name: Set up Python
74-
uses: LizardByte/actions/actions/setup_python@09a6e10dc8175f2933c20bdf35fde0a193a9c00e # v2026.129.194351
74+
uses: LizardByte/actions/actions/setup_python@70bb8d394d1c92f6113aeec6ae9cc959a5763d15 # v2026.227.200013
7575
with:
7676
python-version: '2.7'
7777

.github/workflows/performance.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ jobs:
6363
ref: ${{ github.event.pull_request.head.ref }}
6464

6565
- name: Run before measurements
66-
uses: nextcloud/profiler@6801ee10fc80f10b444388fb6ca9b36ad8a2ea83
66+
uses: nextcloud/profiler@6a74c915048285b35b8e1cd96c0835a635945044
6767
with:
6868
run: |
6969
curl -s -X PROPFIND -u test:test http://localhost:8080/remote.php/dav/files/test
@@ -85,7 +85,7 @@ jobs:
8585
8686
- name: Run after measurements
8787
id: compare
88-
uses: nextcloud/profiler@6801ee10fc80f10b444388fb6ca9b36ad8a2ea83
88+
uses: nextcloud/profiler@6a74c915048285b35b8e1cd96c0835a635945044
8989
with:
9090
run: |
9191
curl -s -X PROPFIND -u test:test http://localhost:8080/remote.php/dav/files/test
@@ -99,7 +99,7 @@ jobs:
9999

100100
- name: Upload profiles
101101
if: always()
102-
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f
102+
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f
103103
with:
104104
name: profiles
105105
path: |

.github/workflows/rector-apply.yml

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
# This workflow is provided via the organization template repository
2+
#
3+
# https://github.com/nextcloud/.github
4+
# https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization
5+
#
6+
# SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors
7+
# SPDX-License-Identifier: MIT
8+
9+
name: Apply rector changes
10+
11+
on:
12+
workflow_dispatch:
13+
schedule:
14+
# At 14:30 on Sundays
15+
- cron: '30 14 * * 0'
16+
17+
permissions:
18+
contents: read
19+
20+
jobs:
21+
build:
22+
runs-on: ubuntu-latest
23+
24+
strategy:
25+
fail-fast: false
26+
matrix:
27+
php-versions: [ '8.2' ]
28+
29+
name: rector-apply
30+
31+
steps:
32+
- name: Checkout
33+
id: checkout
34+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
35+
with:
36+
persist-credentials: false
37+
ref: ${{ github.event.repository.default_branch }}
38+
39+
- name: Set up php${{ matrix.php-versions }}
40+
uses: shivammathur/setup-php@44454db4f0199b8b9685a5d763dc37cbf79108e1 # v2.36.0
41+
with:
42+
php-version: ${{ matrix.php-versions }}
43+
extensions: bz2, ctype, curl, dom, fileinfo, gd, iconv, intl, json, libxml, mbstring, openssl, pcntl, posix, session, simplexml, xmlreader, xmlwriter, zip, zlib, sqlite, pdo_sqlite
44+
coverage: none
45+
ini-file: development
46+
env:
47+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
48+
49+
- name: Install dependencies
50+
run: |
51+
composer remove nextcloud/ocp --dev --no-scripts
52+
composer i
53+
git restore lib/composer/composer
54+
55+
- name: Rector
56+
run: composer run rector
57+
58+
- name: Create Pull Request
59+
uses: peter-evans/create-pull-request@c0f553fe549906ede9cf27b5156039d195d2ece0 # v8.1.0
60+
with:
61+
token: ${{ secrets.COMMAND_BOT_PAT }}
62+
commit-message: 'refactor: Apply rector changes'
63+
committer: GitHub <noreply@github.com>
64+
author: nextcloud-command <nextcloud-command@users.noreply.github.com>
65+
signoff: true
66+
branch: automated/noid/rector-changes
67+
title: 'Apply rector changes'
68+
labels: |
69+
technical debt
70+
3. to review

.github/workflows/stale.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
issues: write
2121

2222
steps:
23-
- uses: actions/stale@997185467fa4f803885201cee163a9f38240193d # v9
23+
- uses: actions/stale@b5d41d4e1d5dceea10e7104786b73624c18a190f # v9
2424
with:
2525
repo-token: ${{ secrets.COMMAND_BOT_PAT }}
2626
stale-issue-message: >

0 commit comments

Comments
 (0)