Skip to content

Commit a9d223b

Browse files
authored
Merge branch 'master' into fix/noid/screenshots-shadow
2 parents 74f865c + 19af3e6 commit a9d223b

502 files changed

Lines changed: 27286 additions & 8557 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 & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,7 @@
88
/developer_manual/digging_deeper/groupware/calendar.rst @SebastianKrupinski @st3iny @tcitworld
99
/developer_manual/digging_deeper/talk.rst @nickvergessen
1010
/user_manual/talk/ @Antreesy @DorraJaouad @nickvergessen
11+
12+
# Auto build actions
13+
.github/workflows/sphinxbuild.yml @skjnldsv
14+
.github/workflows/generate-top-index.yml @skjnldsv

.github/dependabot.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,14 @@ updates:
66
interval: weekly
77
time: "06:00"
88
open-pull-requests-limit: 10
9+
cooldown:
10+
default-days: 10
911
- package-ecosystem: "pip"
1012
directory: "/"
1113
schedule:
1214
interval: "weekly"
1315
time: "06:00"
1416
target-branch: master
1517
open-pull-requests-limit: 10
18+
cooldown:
19+
default-days: 10
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
# Release Notes Instructions
2+
3+
When generating release notes for a new release, use the following prompt with GitHub Copilot (or another AI assistant), substituting the changelog and version number as appropriate.
4+
5+
---
6+
7+
## Prompt
8+
9+
Generate release notes for **[version]** of the `nextcloud/documentation` repository based on the following changelog.
10+
11+
For each PR in the changelog, look up the original (non-backport) PR to identify the true author. Organize the release notes into sections by which manual the PR touches: **Admin Manual**, **Developer Manual**, and **User Manual**. If a PR touches multiple manuals, include it in each relevant section with a summary appropriately tuned to that manual's audience. Eliminate any section for which there are no PRs.
12+
13+
For each entry, write a concise human-readable summary (not just the PR title), and attribute it with `by @author in #number`.
14+
15+
At the end, include a **New Contributors** section calling out any authors whose `author_association` on the original PR is `CONTRIBUTOR` (rather than `MEMBER`) — these are first-time or external contributors.
16+
17+
All PRs are backported via `@backportbot` — include a note at the bottom acknowledging this and clarifying that original authors are credited throughout.
18+
19+
**Changelog:**
20+
21+
[paste changelog here]
22+
23+
---
24+
25+
## Notes
26+
27+
- The changelog can be found on the [releases page](https://github.com/nextcloud/documentation/releases) or generated via GitHub's "Generate release notes" button as a starting point.
28+
- The key instructions that drive the correct output are:
29+
1. **Look up original PRs** to get the real author, not `backportbot`
30+
2. **Organize by manual**, not by type of change
31+
3. **Cross-manual PRs appear in each relevant section** with tuned summaries
32+
4. **`CONTRIBUTOR` association = new/external contributor** worth calling out

.github/workflows/check-occ-command.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ permissions:
1111
jobs:
1212
check-occ-command:
1313
name: Check occ command syntax
14-
runs-on: ubuntu-latest
14+
runs-on: ubuntu-latest-low
1515
steps:
1616
- name: Checkout
1717
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
name: "Build documentation index"
2+
3+
on:
4+
push:
5+
branches:
6+
- master
7+
pull_request:
8+
branches:
9+
- master
10+
11+
permissions:
12+
contents: write
13+
14+
jobs:
15+
build-and-deploy:
16+
name: Build index.html
17+
runs-on: ubuntu-latest
18+
19+
steps:
20+
- name: Cache git metadata
21+
uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
22+
with:
23+
path: .git
24+
key: git-metadata-${{ github.sha }}
25+
restore-keys: |
26+
git-metadata-${{ github.sha }}
27+
git-metadata
28+
29+
- name: Checkout Github Pages branch
30+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
31+
with:
32+
fetch-depth: 0
33+
token: ${{ github.event_name == 'push' && secrets.COMMAND_BOT_PAT || github.token }}
34+
35+
- name: Get stable branches
36+
id: branch
37+
run: |
38+
branches=$(git ls-remote --heads origin "heads/stable[0-9][0-9]" | awk '{gsub(/^refs\/heads\/stable/, "", $2); print $2}' | sort -n -r | tr '\n' ' ')
39+
echo "branches=$branches" >> $GITHUB_OUTPUT
40+
41+
- name: Setup php
42+
uses: shivammathur/setup-php@accd6127cb78bee3e8082180cb391013d204ef9f # v2.37.0
43+
44+
- name: Generate index.html
45+
run: |
46+
php build/build-index.php ${{ steps.branch.outputs.branches }}
47+
mv build/index.html /tmp/index.html
48+
mv build/static/ /tmp/static/
49+
50+
- name: Verify index.html structure and links
51+
run: |
52+
# Temporarily put index.html in build folder for verification
53+
cp /tmp/index.html build/index.html
54+
php build/verify-index.php
55+
56+
- name: Switch to gh-pages branch
57+
if: github.event_name == 'push'
58+
run: |
59+
git fetch origin gh-pages
60+
git checkout gh-pages
61+
git config --local user.email "nextcloud-command@users.noreply.github.com"
62+
git config --local user.name "nextcloud-command"
63+
64+
- name: Commit and push changes
65+
if: github.event_name == 'push'
66+
run: |
67+
# Move the generated index.html and static files to the root of the gh-pages branch
68+
rm -rf index.html static/
69+
mv /tmp/index.html index.html
70+
mv /tmp/static/ static/
71+
git add index.html static/
72+
git commit -m "chore: update index.html for documentation" || echo "No changes to commit"
73+
git push origin gh-pages || echo "Nothing to push (expected if no changes)"
74+
env:
75+
GH_TOKEN: ${{ secrets.COMMAND_BOT_PAT }}

0 commit comments

Comments
 (0)