mirror of
https://github.com/nextcloud/server.git
synced 2026-06-08 16:26:59 -04:00
Fix branch selection in stable23
Signed-off-by: Joas Schilling <coding@schilljs.com>
This commit is contained in:
parent
6db690c3c7
commit
49486de8cd
5 changed files with 11 additions and 11 deletions
|
|
@ -1,5 +1,5 @@
|
|||
codecov:
|
||||
branch: master
|
||||
branch: stable23
|
||||
ci:
|
||||
- drone.nextcloud.com
|
||||
- !scrutinizer-ci.com
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# Nextcloud Server ☁
|
||||
[](https://scrutinizer-ci.com/g/nextcloud/server/?branch=master)
|
||||
[](https://codecov.io/gh/nextcloud/server)
|
||||
[](https://scrutinizer-ci.com/g/nextcloud/server/?branch=stable23)
|
||||
[](https://codecov.io/gh/nextcloud/server)
|
||||
[](https://bestpractices.coreinfrastructure.org/projects/209)
|
||||
|
||||
**A safe home for all your data.**
|
||||
|
|
|
|||
|
|
@ -1,14 +1,14 @@
|
|||
#!/bin/bash
|
||||
# Update Nextcloud apps from latest git master
|
||||
# Update Nextcloud apps from latest git stable23
|
||||
# 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 stable23 and pulls quietly
|
||||
# - shows the 3 most recent commits for context
|
||||
# - removes branches merged into master
|
||||
# - removes branches merged into stable23
|
||||
# - … 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 stable23 && git pull --quiet -p && git --no-pager log -3 --pretty=format:"%h %Cblue%ar%x09%an %Creset%s" && printf "\n" && git branch --merged stable23 | grep -v "stable23$" | xargs git branch -d && cd ..' \;
|
||||
|
|
|
|||
|
|
@ -1,15 +1,15 @@
|
|||
#!/bin/bash
|
||||
# Update Nextcloud server and apps from latest git master
|
||||
# Update Nextcloud server and apps from latest git stable23
|
||||
# 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 stable23
|
||||
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 stable23 | grep -v "stable23$" | xargs git branch -d
|
||||
git submodule update --init
|
||||
|
||||
# Update apps
|
||||
|
|
|
|||
|
|
@ -64,7 +64,7 @@ if [ "$1" = "--acceptance-tests-dir" ]; then
|
|||
fi
|
||||
|
||||
ACCEPTANCE_TESTS_CONFIG_DIR="../../$ACCEPTANCE_TESTS_DIR/config"
|
||||
DEV_BRANCH="master"
|
||||
DEV_BRANCH="stable23"
|
||||
|
||||
# "--timeout-multiplier N" option can be provided to set the timeout multiplier
|
||||
# to be used in ActorContext.
|
||||
|
|
|
|||
Loading…
Reference in a new issue