diff options
| author | Max <max@nextcloud.com> | 2022-01-17 09:42:56 +0300 |
|---|---|---|
| committer | Max <max@nextcloud.com> | 2022-01-17 09:46:23 +0300 |
| commit | c4253b7331e1c67b2767c65ed4d74788e84929e6 (patch) | |
| tree | a8d84021e21ad128fa95bff87657390266346a4a | |
| parent | c1fa5e6bf920bee94c9b6d0f6e7faae75b88d2bd (diff) | |
fix: use BRANCH when checking out viewerfix/viewer-version-in-cypress
Use the viewer that fits the nextcloud release.
Currently cypress tests are failing for all branches
even though the cause seems to be a recent commit to viewers stable branch.
Cypress runs for the stable23 branch of text
should use the stable23 branch of server
and the stable23 branch of viewer
so they match the actual releases that will go out.
| -rw-r--r-- | cypress/Dockerfile | 1 | ||||
| -rw-r--r-- | cypress/server.sh | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/cypress/Dockerfile b/cypress/Dockerfile index 4f2fc4495..b89286b1f 100644 --- a/cypress/Dockerfile +++ b/cypress/Dockerfile @@ -2,6 +2,7 @@ FROM nextcloudci/server:server-17 RUN mkdir /var/www/html/data RUN chown -R www-data:www-data /var/www/html/data +ENV BRANCH master ENTRYPOINT /usr/local/bin/initAndRun.sh diff --git a/cypress/server.sh b/cypress/server.sh index 22f030470..5ff69d841 100644 --- a/cypress/server.sh +++ b/cypress/server.sh @@ -1,5 +1,5 @@ #!/bin/bash -git clone https://github.com/nextcloud/viewer /var/www/html/apps/viewer +git clone https://github.com/nextcloud/viewer --branch $BRANCH /var/www/html/apps/viewer su www-data -c " php occ config:system:set force_language --value en php /var/www/html/occ app:enable viewer |