Fix branch selection in stable22

Signed-off-by: Joas Schilling <coding@schilljs.com>
pull/27649/head
Joas Schilling 3 years ago
parent 4e97270372
commit 99b7b82d72
No known key found for this signature in database
GPG Key ID: 7076EA9751AACDDA

@ -1,5 +1,5 @@
codecov: codecov:
branch: master branch: stable22
ci: ci:
- drone.nextcloud.com - drone.nextcloud.com
- !scrutinizer-ci.com - !scrutinizer-ci.com

@ -1403,7 +1403,7 @@ steps:
commands: commands:
# JavaScript files are not used in integration tests so it is not needed to # JavaScript files are not used in integration tests so it is not needed to
# build them. # build them.
- git clone --depth 1 https://github.com/nextcloud/spreed apps/spreed - git clone --depth 1 --branch stable22 https://github.com/nextcloud/spreed apps/spreed
- name: integration-sharing-v1-video-verification - name: integration-sharing-v1-video-verification
image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:integration-php7.3-2 image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:integration-php7.3-2
commands: commands:

@ -1,6 +1,6 @@
# Nextcloud Server ☁ # 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) [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/nextcloud/server/badges/quality-score.png?b=stable22)](https://scrutinizer-ci.com/g/nextcloud/server/?branch=stable22)
[![codecov](https://codecov.io/gh/nextcloud/server/branch/master/graph/badge.svg)](https://codecov.io/gh/nextcloud/server) [![codecov](https://codecov.io/gh/nextcloud/server/branch/stable22/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) [![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/209/badge)](https://bestpractices.coreinfrastructure.org/projects/209)
**A safe home for all your data.** **A safe home for all your data.**

@ -1,14 +1,14 @@
#!/bin/bash #!/bin/bash
# Update Nextcloud apps from latest git master # Update Nextcloud apps from latest git stable22
# For local development environment # For local development environment
# Use from Nextcloud server folder with `./build/update-apps.sh` # Use from Nextcloud server folder with `./build/update-apps.sh`
# #
# It automatically: # It automatically:
# - goes through all apps which are not shipped via server # - goes through all apps which are not shipped via server
# - shows the app name in bold and uses whitespace for separation # - shows the app name in bold and uses whitespace for separation
# - changes to master and pulls quietly # - changes to stable22 and pulls quietly
# - shows the 3 most recent commits for context # - shows the 3 most recent commits for context
# - removes branches merged into master # - removes branches merged into stable22
# - … could even do the build steps if they are consistent for the apps (like `make`) # - … 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 stable22 && git pull --quiet -p && git --no-pager log -3 --pretty=format:"%h %Cblue%ar%x09%an %Creset%s" && printf "\n" && git branch --merged stable22 | grep -v "stable22$" | xargs git branch -d && cd ..' \;

@ -1,15 +1,15 @@
#!/bin/bash #!/bin/bash
# Update Nextcloud server and apps from latest git master # Update Nextcloud server and apps from latest git stable22
# For local development environment # For local development environment
# Use from Nextcloud server folder with `./build/update.sh` # Use from Nextcloud server folder with `./build/update.sh`
# Update server # Update server
printf "\n\033[1m${PWD##*/}\033[0m\n" printf "\n\033[1m${PWD##*/}\033[0m\n"
git checkout master git checkout stable22
git pull --quiet -p git pull --quiet -p
git --no-pager log -3 --pretty=format:"%h %Cblue%ar%x09%an %Creset%s" git --no-pager log -3 --pretty=format:"%h %Cblue%ar%x09%an %Creset%s"
printf "\n" printf "\n"
git branch --merged master | grep -v "master$" | xargs git branch -d git branch --merged stable22 | grep -v "stable22$" | xargs git branch -d
git submodule update --init git submodule update --init
# Update apps # Update apps

@ -64,7 +64,7 @@ if [ "$1" = "--acceptance-tests-dir" ]; then
fi fi
ACCEPTANCE_TESTS_CONFIG_DIR="../../$ACCEPTANCE_TESTS_DIR/config" ACCEPTANCE_TESTS_CONFIG_DIR="../../$ACCEPTANCE_TESTS_DIR/config"
DEV_BRANCH="master" DEV_BRANCH="stable22"
# "--timeout-multiplier N" option can be provided to set the timeout multiplier # "--timeout-multiplier N" option can be provided to set the timeout multiplier
# to be used in ActorContext. # to be used in ActorContext.

Loading…
Cancel
Save