diff --git a/.codecov.yml b/.codecov.yml index 0514262113e..8f5401f7f00 100644 --- a/.codecov.yml +++ b/.codecov.yml @@ -1,5 +1,5 @@ codecov: - branch: master + branch: stable22 ci: - drone.nextcloud.com - !scrutinizer-ci.com diff --git a/.drone.yml b/.drone.yml index 8217524fbb5..512c4a1225d 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1403,7 +1403,7 @@ steps: commands: # JavaScript files are not used in integration tests so it is not needed to # 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 image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:integration-php7.3-2 commands: diff --git a/README.md b/README.md index ddfe70300d6..0c47f899403 100644 --- 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=stable22)](https://scrutinizer-ci.com/g/nextcloud/server/?branch=stable22) +[![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) **A safe home for all your data.** diff --git a/build/update-apps.sh b/build/update-apps.sh index e4611a79aff..57ee6dd5e08 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 stable22 # 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 stable22 and pulls quietly # - 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`) -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 ..' \; diff --git a/build/update.sh b/build/update.sh index 3a3d2eac5dc..1e8552ae296 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 stable22 # 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 stable22 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 stable22 | grep -v "stable22$" | 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 4da31e35e6c..11edf21de09 100755 --- 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="stable22" # "--timeout-multiplier N" option can be provided to set the timeout multiplier # to be used in ActorContext.