Commit f3f8d5e6 authored by Ludwig Ruderstaller's avatar Ludwig Ruderstaller
Browse files

Merge branch 'develop'

parents 02098b4a 79df53c0
Pipeline #25961 passed with stage
in 1 minute and 37 seconds
...@@ -30,9 +30,9 @@ variables: ...@@ -30,9 +30,9 @@ variables:
- .composer-cache - .composer-cache
policy: pull-push policy: pull-push
test:php7.1: test:php7.3:
<<: *php_definition <<: *php_definition
image: dockerhub.cwd.at/docker/php/cli-xdebug:7.1 image: dockerhub.cwd.at/docker/php/cli-xdebug:7.3
artifacts: artifacts:
name: coverage name: coverage
paths: paths:
...@@ -44,21 +44,9 @@ test:php7.1: ...@@ -44,21 +44,9 @@ test:php7.1:
tags: tags:
- autoscale - autoscale
test:php7.2: test:php7.4:
<<: *php_definition <<: *php_definition
image: dockerhub.cwd.at/docker/php/cli-xdebug:7.2 image: dockerhub.cwd.at/docker/php/cli-xdebug:7.4
cache:
policy: pull
tags:
- autoscale
test:php7.3:
<<: *php_definition
before_script:
- export COMPOSER_CACHE_DIR="$(pwd -P)/.composer-cache"
#- mkdir -p build/api build/coverage build/logs
- composer install --prefer-dist --ansi --no-progress --no-suggest --ignore-platform-reqs
image: dockerhub.cwd.at/docker/php/cli-xdebug:7.3
cache: cache:
policy: pull policy: pull
tags: tags:
......
...@@ -470,8 +470,7 @@ class ZonesEndpointTest extends AbstractTest ...@@ -470,8 +470,7 @@ class ZonesEndpointTest extends AbstractTest
public function testExportZone(Zone $zone) public function testExportZone(Zone $zone)
{ {
$result = $this->getClient()->zones()->export($zone); $result = $this->getClient()->zones()->export($zone);
$this->assertEmpty($result); $this->assertNotEmpty($result);
$this->markAsRisky();
} }
/** /**
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment