diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2020-06-21 09:16:27 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-21 09:16:27 +0200 |
| commit | d7157bb79939bac9cfafb83dd42a551d95ec469b (patch) | |
| tree | 9e8becd552e007bfd7e8a16717fab862b68b119d | |
| parent | 2a29747bb28db090d7665560100b553cbc76c998 (diff) | |
| parent | de61c7d302b411ede892c7530091ffbc2a893bae (diff) | |
| download | nextcloud-server-d7157bb79939bac9cfafb83dd42a551d95ec469b.tar.gz nextcloud-server-d7157bb79939bac9cfafb83dd42a551d95ec469b.zip | |
Merge pull request #21492 from nextcloud/fix/noid/branch-for-cloning-acceptance-related-apps
acceptence tests shall specify which branch to pick when cloning apps
| -rwxr-xr-x | tests/acceptance/run-local.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/acceptance/run-local.sh b/tests/acceptance/run-local.sh index cd63f287096..4da31e35e6c 100755 --- a/tests/acceptance/run-local.sh +++ b/tests/acceptance/run-local.sh @@ -64,6 +64,7 @@ if [ "$1" = "--acceptance-tests-dir" ]; then fi ACCEPTANCE_TESTS_CONFIG_DIR="../../$ACCEPTANCE_TESTS_DIR/config" +DEV_BRANCH="master" # "--timeout-multiplier N" option can be provided to set the timeout multiplier # to be used in ActorContext. @@ -195,7 +196,7 @@ ln --symbolic $(pwd) /var/www/html # Add Notifications app to the "apps" directory (unless it is already there). if [ ! -e "apps/notifications" ]; then - (cd apps && git clone --depth 1 https://github.com/nextcloud/notifications) + (cd apps && git clone --depth 1 --branch ${DEV_BRANCH} https://github.com/nextcloud/notifications) fi INSTALL_AND_CONFIGURE_SERVER_PARAMETERS="" |