aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoas Schilling <coding@schilljs.com>2024-03-28 11:53:34 +0100
committerJoas Schilling <coding@schilljs.com>2024-03-28 11:55:05 +0100
commit7e2d3ef2978d9abb1d6114df3ba56c21af76e475 (patch)
tree5b0e72a601b5e9a8cded621ff0008e5e71960b31
parent28c8a46ef9e076015ae52335e71d9dd5f5432c5e (diff)
downloadnextcloud-server-7e2d3ef2978d9abb1d6114df3ba56c21af76e475.tar.gz
nextcloud-server-7e2d3ef2978d9abb1d6114df3ba56c21af76e475.zip
chore(branchoff): Test against stable29 branches
Signed-off-by: Joas Schilling <coding@schilljs.com>
-rw-r--r--.github/workflows/integration-sqlite.yml2
-rw-r--r--.github/workflows/performance.yml4
-rw-r--r--README.md4
-rwxr-xr-xbuild/update-apps.sh8
-rwxr-xr-xbuild/update.sh6
-rw-r--r--codecov.yml2
6 files changed, 13 insertions, 13 deletions
diff --git a/.github/workflows/integration-sqlite.yml b/.github/workflows/integration-sqlite.yml
index 558eab50639..314f6b0101b 100644
--- a/.github/workflows/integration-sqlite.yml
+++ b/.github/workflows/integration-sqlite.yml
@@ -68,7 +68,7 @@ jobs:
- 'videoverification_features'
php-versions: ['8.2']
- spreed-versions: ['main']
+ spreed-versions: ['stable29']
services:
redis:
diff --git a/.github/workflows/performance.yml b/.github/workflows/performance.yml
index 9e03a135e62..0d909e5e684 100644
--- a/.github/workflows/performance.yml
+++ b/.github/workflows/performance.yml
@@ -56,7 +56,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: stable29
- name: Apply PR
run: |
@@ -78,7 +78,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: stable29
compare-with: before.json
- name: Upload profiles
diff --git a/README.md b/README.md
index c99052c69f3..1d298640e74 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
# 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=stable29)](https://scrutinizer-ci.com/g/nextcloud/server/?branch=stable29)
+[![codecov](https://codecov.io/gh/nextcloud/server/branch/stable29/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)
diff --git a/build/update-apps.sh b/build/update-apps.sh
index e4611a79aff..2d9e6307c04 100755
--- a/build/update-apps.sh
+++ b/build/update-apps.sh
@@ -1,14 +1,14 @@
#!/bin/bash
-# Update Nextcloud apps from latest git master
+# Update Nextcloud apps from latest git stable29
# 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 and pulls quietly
+# - changes to stable29 and pulls quietly
# - shows the 3 most recent commits for context
-# - removes branches merged into master
+# - removes branches merged into stable29
# - … could even do the build steps if they are consistent for the apps (like `make`)
-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 ..' \;
+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 ..' \;
diff --git a/build/update.sh b/build/update.sh
index 3a3d2eac5dc..4aad7edb7c4 100755
--- a/build/update.sh
+++ b/build/update.sh
@@ -1,15 +1,15 @@
#!/bin/bash
-# Update Nextcloud server and apps from latest git master
+# Update Nextcloud server and apps from latest git stable29
# 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 stable29
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 stable29 | grep -v "stable29$" | xargs git branch -d
git submodule update --init
# Update apps
diff --git a/codecov.yml b/codecov.yml
index 66d0b537620..2b24040fe6b 100644
--- a/codecov.yml
+++ b/codecov.yml
@@ -1,5 +1,5 @@
codecov:
- branch: master
+ branch: stable29
ci:
- drone.nextcloud.com
- '!scrutinizer-ci.com'