Skip to content

Commit 7e2d3ef

Browse files
committed
chore(branchoff): Test against stable29 branches
Signed-off-by: Joas Schilling <coding@schilljs.com>
1 parent 28c8a46 commit 7e2d3ef

6 files changed

Lines changed: 13 additions & 13 deletions

File tree

.github/workflows/integration-sqlite.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ jobs:
6868
- 'videoverification_features'
6969

7070
php-versions: ['8.2']
71-
spreed-versions: ['main']
71+
spreed-versions: ['stable29']
7272

7373
services:
7474
redis:

.github/workflows/performance.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
curl -s -u test:test -T README.md http://localhost:8080/remote.php/dav/files/test/new_file.txt
5757
curl -s -u test:test -X DELETE http://localhost:8080/remote.php/dav/files/test/new_file.txt
5858
output: before.json
59-
profiler-branch: master
59+
profiler-branch: stable29
6060

6161
- name: Apply PR
6262
run: |
@@ -78,7 +78,7 @@ jobs:
7878
curl -s -u test:test -T README.md http://localhost:8080/remote.php/dav/files/test/new_file.txt
7979
curl -s -u test:test -X DELETE http://localhost:8080/remote.php/dav/files/test/new_file.txt
8080
output: after.json
81-
profiler-branch: master
81+
profiler-branch: stable29
8282
compare-with: before.json
8383

8484
- name: Upload profiles

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Nextcloud Server ☁
2-
[![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)
3-
[![codecov](https://codecov.io/gh/nextcloud/server/branch/master/graph/badge.svg)](https://codecov.io/gh/nextcloud/server)
2+
[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/nextcloud/server/badges/quality-score.png?b=stable29)](https://scrutinizer-ci.com/g/nextcloud/server/?branch=stable29)
3+
[![codecov](https://codecov.io/gh/nextcloud/server/branch/stable29/graph/badge.svg)](https://codecov.io/gh/nextcloud/server)
44
[![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/209/badge)](https://bestpractices.coreinfrastructure.org/projects/209)
55
[![Design](https://contribute.design/api/shield/nextcloud/server)](https://contribute.design/nextcloud/server)
66

build/update-apps.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
#!/bin/bash
2-
# Update Nextcloud apps from latest git master
2+
# Update Nextcloud apps from latest git stable29
33
# For local development environment
44
# Use from Nextcloud server folder with `./build/update-apps.sh`
55
#
66
# It automatically:
77
# - goes through all apps which are not shipped via server
88
# - shows the app name in bold and uses whitespace for separation
9-
# - changes to master and pulls quietly
9+
# - changes to stable29 and pulls quietly
1010
# - shows the 3 most recent commits for context
11-
# - removes branches merged into master
11+
# - removes branches merged into stable29
1212
# - … could even do the build steps if they are consistent for the apps (like `make`)
1313

14-
find apps* -maxdepth 2 -name .git -exec sh -c 'cd {}/../ && printf "\n\033[1m${PWD##*/}\033[0m\n" && git checkout master && 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 && cd ..' \;
14+
find apps* -maxdepth 2 -name .git -exec sh -c 'cd {}/../ && printf "\n\033[1m${PWD##*/}\033[0m\n" && git checkout stable29 && git pull --quiet -p && git --no-pager log -3 --pretty=format:"%h %Cblue%ar%x09%an %Creset%s" && printf "\n" && git branch --merged stable29 | grep -v "stable29$" | xargs git branch -d && cd ..' \;

build/update.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
#!/bin/bash
2-
# Update Nextcloud server and apps from latest git master
2+
# Update Nextcloud server and apps from latest git stable29
33
# For local development environment
44
# Use from Nextcloud server folder with `./build/update.sh`
55

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

1515
# Update apps

codecov.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
codecov:
2-
branch: master
2+
branch: stable29
33
ci:
44
- drone.nextcloud.com
55
- '!scrutinizer-ci.com'

0 commit comments

Comments
 (0)