Fix branch selection in stable24

Signed-off-by: Joas Schilling <coding@schilljs.com>
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>

diff --git a/.codecov.yml b/.codecov.yml
index 0514262113ec22378b3c43a8408dd989d1382337..2a48968e147ee457bd64be8302bf1b3bb8f44e4f 100644 (file)
--- a/.codecov.yml
+++ b/.codecov.yml
@@ -1,5 +1,5 @@
 codecov:
-  branch: master
+  branch: stable24
   ci:
     - drone.nextcloud.com
     - !scrutinizer-ci.com

diff --git a/README.md b/README.md
index f955bdb10f3ca7de7d820512ba078a48ad0da6e4..424f1a39d358f91691e1c4aeaeaa945bc8dd5c21 100644 (file)
--- 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=stable24)](https://scrutinizer-ci.com/g/nextcloud/server/?branch=stable24)
+[![codecov](https://codecov.io/gh/nextcloud/server/branch/stable24/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)
 
 **A safe home for all your data.**

diff --git a/build/update-apps.sh b/build/update-apps.sh
index e4611a79affcf9ceab13f8b60da497ee73415932..b3853aa0eac3b90193a9d204f5aca0b2f075a095 100755 (executable)
--- 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 stable24
 # 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 stable24 and pulls quietly
 # - shows the 3 most recent commits for context
-# - removes branches merged into master
+# - removes branches merged into stable24
 # - … 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 stable24 && git pull --quiet -p && git --no-pager log -3 --pretty=format:"%h %Cblue%ar%x09%an %Creset%s" && printf "\n" && git branch --merged stable24 | grep -v "stable24$" | xargs git branch -d && cd ..' \;

diff --git a/build/update.sh b/build/update.sh
index 3a3d2eac5dc9a5befc8c90594c52d6b71f1f9828..d83e1964da3e9ed02e8e339814803acb6569eadd 100755 (executable)
--- 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 stable24
 # 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 stable24
 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 stable24 | grep -v "stable24$" | xargs git branch -d
 git submodule update --init
 
 # Update apps

diff --git a/tests/acceptance/run-local.sh b/tests/acceptance/run-local.sh
index 4da31e35e6c8d1074475f3a1a76219022a7e146c..36932851e7cce5e27c3df7a687f97c9296275e89 100755 (executable)
--- a/tests/acceptance/run-local.sh
+++ b/tests/acceptance/run-local.sh
@@ -64,7 +64,7 @@ if [ "$1" = "--acceptance-tests-dir" ]; then
 fi
 
 ACCEPTANCE_TESTS_CONFIG_DIR="../../$ACCEPTANCE_TESTS_DIR/config"
-DEV_BRANCH="master"
+DEV_BRANCH="stable24"
 
 # "--timeout-multiplier N" option can be provided to set the timeout multiplier
 # to be used in ActorContext.