Skip to content

Commit 038196a

Browse files
Merge pull request #54862 from nextcloud/branchoff/welcome-stable32
[stable32] Welcome stable32
2 parents ee82266 + 394d5e2 commit 038196a

File tree

7 files changed

+15
-15
lines changed

7 files changed

+15
-15
lines changed

.github/workflows/integration-sqlite.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@ jobs:
7474
- 'videoverification_features'
7575

7676
php-versions: ['8.1']
77-
spreed-versions: ['main']
78-
activity-versions: ['master']
77+
spreed-versions: ['stable32']
78+
activity-versions: ['stable32']
7979

8080
services:
8181
redis:

.github/workflows/performance.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ jobs:
7171
curl -s -u test:test -T README.md http://localhost:8080/remote.php/dav/files/test/new_file.txt
7272
curl -s -u test:test -X DELETE http://localhost:8080/remote.php/dav/files/test/new_file.txt
7373
output: before.json
74-
profiler-branch: master
74+
profiler-branch: stable32
7575

7676
- name: Apply PR # zizmor: ignore[template-injection]
7777
run: |
@@ -93,7 +93,7 @@ jobs:
9393
curl -s -u test:test -T README.md http://localhost:8080/remote.php/dav/files/test/new_file.txt
9494
curl -s -u test:test -X DELETE http://localhost:8080/remote.php/dav/files/test/new_file.txt
9595
output: after.json
96-
profiler-branch: master
96+
profiler-branch: stable32
9797
compare-with: before.json
9898

9999
- name: Upload profiles

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55
-->
66
# Nextcloud Server ☁
77
[![REUSE status](https://api.reuse.software/badge/github.com/nextcloud/server)](https://api.reuse.software/info/github.com/nextcloud/server)
8-
[![codecov](https://codecov.io/gh/nextcloud/server/branch/master/graph/badge.svg)](https://codecov.io/gh/nextcloud/server)
8+
[![codecov](https://codecov.io/gh/nextcloud/server/branch/stable32/graph/badge.svg)](https://codecov.io/gh/nextcloud/server)
99
[![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/209/badge)](https://bestpractices.coreinfrastructure.org/projects/209)
1010
[![Design](https://contribute.design/api/shield/nextcloud/server)](https://contribute.design/nextcloud/server)
1111

1212
**A safe home for all your data.**
1313

14-
![](https://raw.githubusercontent.com/nextcloud/screenshots/master/nextcloud-hub-files-25-preview.png)
14+
![](https://raw.githubusercontent.com/nextcloud/screenshots/stable32/nextcloud-hub-files-25-preview.png)
1515

1616
## Why is this so awesome? 🤩
1717

@@ -58,7 +58,7 @@ There are many ways to contribute, of which development is only one! Find out [h
5858

5959
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.
6060

61-
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.
61+
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 `stable32` and have to be installed manually by cloning them into the `apps` subfolder.
6262

6363
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.
6464

build/update-apps.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@
33
# SPDX-FileCopyrightText: 2019 Nextcloud GmbH and Nextcloud contributors
44
# SPDX-License-Identifier: AGPL-3.0-or-later
55
#
6-
# Update Nextcloud apps from latest git master
6+
# Update Nextcloud apps from latest git stable32
77
# For local development environment
88
# Use from Nextcloud server folder with `./build/update-apps.sh`
99
#
1010
# It automatically:
1111
# - goes through all apps which are not shipped via server
1212
# - shows the app name in bold and uses whitespace for separation
13-
# - changes to master/main and pulls quietly
13+
# - changes to stable32 and pulls quietly
1414
# - shows the 3 most recent commits for context
15-
# - removes branches merged into master/main
15+
# - removes branches merged into stable32
1616
# - … could even do the build steps if they are consistent for the apps (like `make`)
1717

1818
set -euo pipefail

build/update.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@
33
# SPDX-FileCopyrightText: 2019 Nextcloud GmbH and Nextcloud contributors
44
# SPDX-License-Identifier: AGPL-3.0-or-later
55
#
6-
# Update Nextcloud server and apps from latest git master
6+
# Update Nextcloud server and apps from latest git stable32
77
# For local development environment
88
# Use from Nextcloud server folder with `./build/update.sh`
99

1010
# Update server
1111
printf "\n\033[1m${PWD##*/}\033[0m\n"
12-
git checkout master
12+
git checkout stable32
1313
git pull --quiet -p
1414
git --no-pager log -3 --pretty=format:"%h %Cblue%ar%x09%an %Creset%s"
1515
printf "\n"
16-
git branch --merged master | grep -v "master$" | xargs git branch -d
16+
git branch --merged stable32 | grep -v "stable32$" | xargs git branch -d
1717
git submodule update --init
1818

1919
# Update apps

codecov.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# SPDX-FileCopyrightText: 2023 Nextcloud GmbH and Nextcloud contributors
22
# SPDX-License-Identifier: AGPL-3.0-or-later
33
codecov:
4-
branch: master
4+
branch: stable32
55
ci:
66
- drone.nextcloud.com
77
- '!scrutinizer-ci.com'

0 commit comments

Comments
 (0)