]> source.dussan.org Git - nextcloud-server.git/commitdiff
chore(branchoff): Test against stable29 branches 44531/head
authorJoas Schilling <coding@schilljs.com>
Thu, 28 Mar 2024 10:53:34 +0000 (11:53 +0100)
committerJoas Schilling <coding@schilljs.com>
Thu, 28 Mar 2024 10:55:05 +0000 (11:55 +0100)
Signed-off-by: Joas Schilling <coding@schilljs.com>
.github/workflows/integration-sqlite.yml
.github/workflows/performance.yml
README.md
build/update-apps.sh
build/update.sh
codecov.yml

index 558eab50639296f18a1df8be9b75bef3b44e5725..314f6b0101b0f254c62d06a1f6e2699f5327bfb2 100644 (file)
@@ -68,7 +68,7 @@ jobs:
           - 'videoverification_features'
 
         php-versions: ['8.2']
-        spreed-versions: ['main']
+        spreed-versions: ['stable29']
 
     services:
       redis:
index 9e03a135e623d697e33f66f99cce35d4360ed716..0d909e5e68433f977f1d55533d7c6d860b2426ff 100644 (file)
@@ -56,7 +56,7 @@ jobs:
             curl -s -u test:test -T README.md http://localhost:8080/remote.php/dav/files/test/new_file.txt
             curl -s -u test:test -X DELETE http://localhost:8080/remote.php/dav/files/test/new_file.txt
           output: before.json
-          profiler-branch: master
+          profiler-branch: stable29
 
       - name: Apply PR
         run: |
@@ -78,7 +78,7 @@ jobs:
             curl -s -u test:test -T README.md http://localhost:8080/remote.php/dav/files/test/new_file.txt
             curl -s -u test:test -X DELETE http://localhost:8080/remote.php/dav/files/test/new_file.txt
           output: after.json
-          profiler-branch: master
+          profiler-branch: stable29
           compare-with: before.json
 
       - name: Upload profiles
index c99052c69f32bef8fc0d1ef7bc54a4332864d5ef..1d298640e74258a4f111d0af462d2d8ae3f876c6 100644 (file)
--- 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=stable29)](https://scrutinizer-ci.com/g/nextcloud/server/?branch=stable29)
+[![codecov](https://codecov.io/gh/nextcloud/server/branch/stable29/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)
 [![Design](https://contribute.design/api/shield/nextcloud/server)](https://contribute.design/nextcloud/server)
 
index e4611a79affcf9ceab13f8b60da497ee73415932..2d9e6307c04cac285fe75024583b39f9ed879cc4 100755 (executable)
@@ -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 ..' \;
index 3a3d2eac5dc9a5befc8c90594c52d6b71f1f9828..4aad7edb7c4369a13b93b41de8095547f2346f30 100755 (executable)
@@ -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
index 66d0b5376208f5c4c4cfcbcd0f86b71c54793ebd..2b24040fe6b98c661a00ec65a6f65247b4c1bdca 100644 (file)
@@ -1,5 +1,5 @@
 codecov:
-  branch: master
+  branch: stable29
   ci:
   - drone.nextcloud.com
   - '!scrutinizer-ci.com'