From 0dc641795b8d0b85e7f4c4358a0fd69202b5d310 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Thu, 23 Jan 2025 10:29:42 +0100 Subject: [PATCH 1/4] fix: Adjust version in 3rdparty composer.json Signed-off-by: Joas Schilling --- 3rdparty | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/3rdparty b/3rdparty index be9f55a570c72..1b8a8b7317d29 160000 --- a/3rdparty +++ b/3rdparty @@ -1 +1 @@ -Subproject commit be9f55a570c72e0318b0d71fa6d6b35412f4e4ca +Subproject commit 1b8a8b7317d290d18ea4b120b1d10c02b0b86fc2 From e11adbd09db3b95214044f3dd842009056c77401 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Thu, 23 Jan 2025 10:32:24 +0100 Subject: [PATCH 2/4] build: Adjust checkout branch script Signed-off-by: Joas Schilling --- build/update-apps.sh | 6 +++--- build/update.sh | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build/update-apps.sh b/build/update-apps.sh index c4de941023781..bcb4dc691bfec 100755 --- a/build/update-apps.sh +++ b/build/update-apps.sh @@ -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 diff --git a/build/update.sh b/build/update.sh index 4f20535d9170d..8d2d006f9462f 100755 --- a/build/update.sh +++ b/build/update.sh @@ -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 From afd23e61fee36d9f016a54bddaf8a2221f993679 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Thu, 23 Jan 2025 10:33:42 +0100 Subject: [PATCH 3/4] ci: Adjust branches of apps used in tests Signed-off-by: Joas Schilling --- .github/workflows/integration-sqlite.yml | 2 +- .github/workflows/performance.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/integration-sqlite.yml b/.github/workflows/integration-sqlite.yml index d19e45600ae5f..ebffdd8a62ba5 100644 --- a/.github/workflows/integration-sqlite.yml +++ b/.github/workflows/integration-sqlite.yml @@ -72,7 +72,7 @@ jobs: - 'videoverification_features' php-versions: ['8.1'] - spreed-versions: ['main'] + spreed-versions: ['stable31'] services: redis: diff --git a/.github/workflows/performance.yml b/.github/workflows/performance.yml index a6e76fa3319c1..bd7789f8624a4 100644 --- a/.github/workflows/performance.yml +++ b/.github/workflows/performance.yml @@ -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 From fafa94e51f4bdb3b075ccf1e4b93d4b0bee91fe3 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Thu, 23 Jan 2025 10:35:37 +0100 Subject: [PATCH 4/4] fix: Adjust branch name in server files Signed-off-by: Joas Schilling --- README.md | 8 ++++---- codecov.yml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 24c66a4f04d84..5de15af5b31e9 100644 --- a/README.md +++ b/README.md @@ -5,14 +5,14 @@ --> # Nextcloud Server ☁ [![REUSE status](https://api.reuse.software/badge/github.com/nextcloud/server)](https://api.reuse.software/info/github.com/nextcloud/server) -[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/nextcloud/server/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/nextcloud/server/?branch=master) -[![codecov](https://codecov.io/gh/nextcloud/server/branch/master/graph/badge.svg)](https://codecov.io/gh/nextcloud/server) +[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/nextcloud/server/badges/quality-score.png?b=stable31)](https://scrutinizer-ci.com/g/nextcloud/server/?branch=stable31) +[![codecov](https://codecov.io/gh/nextcloud/server/branch/stable31/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-files-25-preview.png) +![](https://raw.githubusercontent.com/nextcloud/screenshots/stable31/nextcloud-hub-files-25-preview.png) ## 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. diff --git a/codecov.yml b/codecov.yml index 20139e0111419..d0eab0b26c0f9 100644 --- a/codecov.yml +++ b/codecov.yml @@ -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'