diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2021-02-04 00:47:41 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-04 00:47:41 +0300 |
| commit | 2acc4db3569bfa8e274397549fa14c23d0a081f7 (patch) | |
| tree | 3631bce585a45adfc3ffd93bfa7fea4c1ae25207 | |
| parent | f57fc899754ff67cf39251265d208f562a82737e (diff) | |
| parent | fa3a2820f494d1491b8070540cea28769af6feb4 (diff) | |
Merge pull request #25457 from nextcloud/update-stable21-target-versions
Update stable21 target versions
| -rw-r--r-- | .drone.yml | 2 | ||||
| -rwxr-xr-x | tests/acceptance/run-local.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/.drone.yml b/.drone.yml index 8ea80eb76c5..26124e8753e 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1353,7 +1353,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 stable21 https://github.com/nextcloud/spreed apps/spreed - name: integration-sharing-v1-video-verification image: nextcloudci/integration-php7.3:integration-php7.3-2 commands: diff --git a/tests/acceptance/run-local.sh b/tests/acceptance/run-local.sh index 4da31e35e6c..dc143850c40 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="stable21" # "--timeout-multiplier N" option can be provided to set the timeout multiplier # to be used in ActorContext. |