Merge pull request #60394 from nextcloud/chore/welcome-stable34

[stable34] Welcome stable34
This commit is contained in:
Joas Schilling 2026-05-15 11:31:04 +02:00 committed by GitHub
commit 353f438337
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 16 additions and 16 deletions

View file

@ -8,7 +8,7 @@
Make sure you have the [VSCode DevContainer](https://code.visualstudio.com/docs/devcontainers/containers) extensions installed. If you open the project, VSCode will ask you if you want to open it inside of the DevContainer. If that's not the case, use <kbd>F1</kbd>&rarr;*Dev Containers: Open Folder in Container*.
Alternatively open the project directly in [GitHub Codespaces](https://github.com/codespaces/new?hide_repo_select=true&ref=master&repo=60243197&skip_quickstart=true).
Alternatively open the project directly in [GitHub Codespaces](https://github.com/codespaces/new?hide_repo_select=true&ref=stable34&repo=60243197&skip_quickstart=true).
That's already it. Everything else will be configured automatically by the Containers startup routine.

View file

@ -77,8 +77,8 @@ jobs:
php-versions: ['8.4']
guests-versions: ['main']
spreed-versions: ['main']
activity-versions: ['master']
spreed-versions: ['stable34']
activity-versions: ['stable34']
services:
redis:

View file

@ -73,7 +73,7 @@ jobs:
curl -s -u test:test -T README.md http://localhost:8080/remote.php/dav/files/test/new_file.txt
curl -s -u test:test -X DELETE http://localhost:8080/remote.php/dav/files/test/new_file.txt
output: before.json
profiler-branch: master
profiler-branch: stable34
- name: Apply PR # zizmor: ignore[template-injection]
run: |
@ -95,7 +95,7 @@ jobs:
curl -s -u test:test -T README.md http://localhost:8080/remote.php/dav/files/test/new_file.txt
curl -s -u test:test -X DELETE http://localhost:8080/remote.php/dav/files/test/new_file.txt
output: after.json
profiler-branch: master
profiler-branch: stable34
compare-with: before.json
- name: Upload profiles

@ -1 +1 @@
Subproject commit 5d09a7f56e2d01b5f4083e65db77c4f7aa775252
Subproject commit 14658474977aa4e3faab00af586c0dec5317a327

View file

@ -5,13 +5,13 @@
-->
# Nextcloud Server ☁
[![REUSE status](https://api.reuse.software/badge/github.com/nextcloud/server)](https://api.reuse.software/info/github.com/nextcloud/server)
[![codecov](https://codecov.io/gh/nextcloud/server/branch/master/graph/badge.svg)](https://codecov.io/gh/nextcloud/server)
[![codecov](https://codecov.io/gh/nextcloud/server/branch/stable34/graph/badge.svg)](https://codecov.io/gh/nextcloud/server)
[![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/209/badge)](https://bestpractices.coreinfrastructure.org/projects/209)
[![Design](https://contribute.design/api/shield/nextcloud/server)](https://contribute.design/nextcloud/server)
**A safe home for all your data.**
![](https://raw.githubusercontent.com/nextcloud/screenshots/master/nextcloud-hub-25-files.png)
![](https://raw.githubusercontent.com/nextcloud/screenshots/stable34/nextcloud-hub-25-files.png)
## Why is this so awesome? 🤩
@ -58,7 +58,7 @@ There are many ways to contribute, of which development is only one! Find out [h
Third-party components are handled as git submodules which have to be initialized first. So aside from the regular git checkout invoking `git submodule update --init` or a similar command is needed, for details see Git documentation.
Several apps that are included by default in regular releases such as [First run wizard](https://github.com/nextcloud/firstrunwizard) or [Activity](https://github.com/nextcloud/activity) are missing in `master` and have to be installed manually by cloning them into the `apps` subfolder.
Several apps that are included by default in regular releases such as [First run wizard](https://github.com/nextcloud/firstrunwizard) or [Activity](https://github.com/nextcloud/activity) are missing in `stable34` and have to be installed manually by cloning them into the `apps` subfolder.
Otherwise, git checkouts can be handled the same as release archives, by using the `stable*` branches. Note they should never be used on production systems.

View file

@ -3,16 +3,16 @@
# SPDX-FileCopyrightText: 2019 Nextcloud GmbH and Nextcloud contributors
# SPDX-License-Identifier: AGPL-3.0-or-later
#
# Update Nextcloud apps from latest git master
# Update Nextcloud apps from latest git stable34
# For local development environment
# Use from Nextcloud server folder with `./build/update-apps.sh`
#
# It automatically:
# - goes through all apps which are not shipped via server
# - shows the app name in bold and uses whitespace for separation
# - changes to master/main and pulls quietly
# - changes to stable34 and pulls quietly
# - shows the 3 most recent commits for context
# - removes branches merged into master/main
# - removes branches merged into stable34
# - … could even do the build steps if they are consistent for the apps (like `make`)
set -euo pipefail

View file

@ -3,17 +3,17 @@
# SPDX-FileCopyrightText: 2019 Nextcloud GmbH and Nextcloud contributors
# SPDX-License-Identifier: AGPL-3.0-or-later
#
# Update Nextcloud server and apps from latest git master
# Update Nextcloud server and apps from latest git stable34
# For local development environment
# Use from Nextcloud server folder with `./build/update.sh`
# Update server
printf "\n\033[1m${PWD##*/}\033[0m\n"
git checkout master
git checkout stable34
git pull --quiet -p
git --no-pager log -3 --pretty=format:"%h %Cblue%ar%x09%an %Creset%s"
printf "\n"
git branch --merged master | grep -v "master$" | xargs git branch -d
git branch --merged stable34 | grep -v "stable34$" | xargs git branch -d
git submodule update --init
# Update apps

View file

@ -1,7 +1,7 @@
# SPDX-FileCopyrightText: 2023 Nextcloud GmbH and Nextcloud contributors
# SPDX-License-Identifier: AGPL-3.0-or-later
codecov:
branch: master
branch: stable34
ci:
- drone.nextcloud.com
- '!scrutinizer-ci.com'