diff options
| author | Maxence Lange <maxence@artificial-owl.com> | 2023-01-31 21:49:15 -0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-31 21:49:15 -0100 |
| commit | d2df81a9695901837dcfa0776180a51d680ba39e (patch) | |
| tree | 3c6713083c53bb9ce3380921f2ae7e69e7d271bd | |
| parent | 873501a141c3ddfc3d8ce4291123a7a2842ece8e (diff) | |
| parent | 1a655e88d96445a16e3ac78e1783fb316a6e78e2 (diff) | |
| download | nextcloud-server-d2df81a9695901837dcfa0776180a51d680ba39e.tar.gz nextcloud-server-d2df81a9695901837dcfa0776180a51d680ba39e.zip | |
Merge pull request #36458 from nextcloud/fix/noid/run-tests-php-8.0
test runs with php8.0 images
| -rwxr-xr-x | build/integration/run-docker.sh | 2 | ||||
| -rwxr-xr-x | tests/acceptance/run.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/build/integration/run-docker.sh b/build/integration/run-docker.sh index 7dd270b0202..c34ca25d929 100755 --- a/build/integration/run-docker.sh +++ b/build/integration/run-docker.sh @@ -215,7 +215,7 @@ cd "$(dirname $0)" # "--image XXX" option can be provided to set the Docker image to use to run # the integration tests (one of the "nextcloudci/phpX.Y:phpX.Y-Z" or # "ghcr.io/nextcloud/continuous-integration-integration-phpX.Y:latest" images). -NEXTCLOUD_LOCAL_IMAGE="ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest" +NEXTCLOUD_LOCAL_IMAGE="ghcr.io/nextcloud/continuous-integration-integration-php8.0:latest" if [ "$1" = "--image" ]; then NEXTCLOUD_LOCAL_IMAGE=$2 diff --git a/tests/acceptance/run.sh b/tests/acceptance/run.sh index a4c0a594756..8800f65a931 100755 --- a/tests/acceptance/run.sh +++ b/tests/acceptance/run.sh @@ -144,7 +144,7 @@ function prepareDocker() { --network=container:$SELENIUM_CONTAINER \ --volume composer_cache:/root/.composer \ --interactive \ - --tty ghcr.io/nextcloud/continuous-integration-acceptance-php7.4:latest bash + --tty ghcr.io/nextcloud/continuous-integration-acceptance-php8.0:latest bash # Use the $TMPDIR or, if not set, fall back to /tmp. NEXTCLOUD_LOCAL_TAR="$($MKTEMP --tmpdir="${TMPDIR:-/tmp}" --suffix=.tar nextcloud-local-XXXXXXXXXX)" |