mirror of
https://github.com/nextcloud/server.git
synced 2026-03-27 04:43:20 -04:00
build: Adjust checkout branch script
Signed-off-by: Joas Schilling <coding@schilljs.com>
This commit is contained in:
parent
ee82266210
commit
82aecde85d
2 changed files with 6 additions and 6 deletions
|
|
@ -3,16 +3,16 @@
|
|||
# SPDX-FileCopyrightText: 2019 Nextcloud GmbH and Nextcloud contributors
|
||||
# SPDX-License-Identifier: AGPL-3.0-or-later
|
||||
#
|
||||
# Update Nextcloud apps from latest git master
|
||||
# Update Nextcloud apps from latest git stable32
|
||||
# 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/main and pulls quietly
|
||||
# - changes to stable32 and pulls quietly
|
||||
# - shows the 3 most recent commits for context
|
||||
# - removes branches merged into master/main
|
||||
# - removes branches merged into stable32
|
||||
# - … could even do the build steps if they are consistent for the apps (like `make`)
|
||||
|
||||
set -euo pipefail
|
||||
|
|
|
|||
|
|
@ -3,17 +3,17 @@
|
|||
# SPDX-FileCopyrightText: 2019 Nextcloud GmbH and Nextcloud contributors
|
||||
# SPDX-License-Identifier: AGPL-3.0-or-later
|
||||
#
|
||||
# Update Nextcloud server and apps from latest git master
|
||||
# Update Nextcloud server and apps from latest git stable32
|
||||
# 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 stable32
|
||||
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 stable32 | grep -v "stable32$" | xargs git branch -d
|
||||
git submodule update --init
|
||||
|
||||
# Update apps
|
||||
|
|
|
|||
Loading…
Reference in a new issue