mirror of
https://github.com/nextcloud/server.git
synced 2026-06-10 09:13:19 -04:00
Merge pull request #50351 from nextcloud/branchoff/welcome-stable31
chore(branchoff): Test against stable31 branches
This commit is contained in:
commit
f6b179e059
7 changed files with 15 additions and 15 deletions
2
.github/workflows/integration-sqlite.yml
vendored
2
.github/workflows/integration-sqlite.yml
vendored
|
|
@ -72,7 +72,7 @@ jobs:
|
|||
- 'videoverification_features'
|
||||
|
||||
php-versions: ['8.1']
|
||||
spreed-versions: ['main']
|
||||
spreed-versions: ['stable31']
|
||||
|
||||
services:
|
||||
redis:
|
||||
|
|
|
|||
4
.github/workflows/performance.yml
vendored
4
.github/workflows/performance.yml
vendored
|
|
@ -64,7 +64,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: stable31
|
||||
|
||||
- name: Apply PR
|
||||
run: |
|
||||
|
|
@ -86,7 +86,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: stable31
|
||||
compare-with: before.json
|
||||
|
||||
- name: Upload profiles
|
||||
|
|
|
|||
2
3rdparty
2
3rdparty
|
|
@ -1 +1 @@
|
|||
Subproject commit be9f55a570c72e0318b0d71fa6d6b35412f4e4ca
|
||||
Subproject commit 1b8a8b7317d290d18ea4b120b1d10c02b0b86fc2
|
||||
|
|
@ -5,14 +5,14 @@
|
|||
-->
|
||||
# Nextcloud Server ☁
|
||||
[](https://api.reuse.software/info/github.com/nextcloud/server)
|
||||
[](https://scrutinizer-ci.com/g/nextcloud/server/?branch=master)
|
||||
[](https://codecov.io/gh/nextcloud/server)
|
||||
[](https://scrutinizer-ci.com/g/nextcloud/server/?branch=stable31)
|
||||
[](https://codecov.io/gh/nextcloud/server)
|
||||
[](https://bestpractices.coreinfrastructure.org/projects/209)
|
||||
[](https://contribute.design/nextcloud/server)
|
||||
|
||||
**A safe home for all your data.**
|
||||
|
||||

|
||||

|
||||
|
||||
## Why is this so awesome? 🤩
|
||||
|
||||
|
|
@ -59,7 +59,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 `stable31` 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.
|
||||
|
||||
|
|
|
|||
|
|
@ -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 stable31
|
||||
# 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 stable31 and pulls quietly
|
||||
# - shows the 3 most recent commits for context
|
||||
# - removes branches merged into master/main
|
||||
# - removes branches merged into stable31
|
||||
# - … could even do the build steps if they are consistent for the apps (like `make`)
|
||||
|
||||
set -euo pipefail
|
||||
|
|
|
|||
|
|
@ -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 stable31
|
||||
# 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 stable31
|
||||
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 stable31 | grep -v "stable31$" | xargs git branch -d
|
||||
git submodule update --init
|
||||
|
||||
# Update apps
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
# SPDX-FileCopyrightText: 2023 Nextcloud GmbH and Nextcloud contributors
|
||||
# SPDX-License-Identifier: AGPL-3.0-or-later
|
||||
codecov:
|
||||
branch: master
|
||||
branch: stable31
|
||||
ci:
|
||||
- drone.nextcloud.com
|
||||
- '!scrutinizer-ci.com'
|
||||
|
|
|
|||
Loading…
Reference in a new issue