summaryrefslogtreecommitdiffstats
path: root/build
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 /build
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>
Diffstat (limited to 'build')
-rwxr-xr-xbuild/update-apps.sh8
-rwxr-xr-xbuild/update.sh6
2 files changed, 7 insertions, 7 deletions
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