summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTilo Spannagel <development@tilosp.de>2019-06-18 16:33:55 +0200
committerGitHub <noreply@github.com>2019-06-18 16:33:55 +0200
commit17a6790ac8adda1fd56e30a22ec91c0882fc96d5 (patch)
tree636d40f526d9a04b402b5e492a924bd81e3a63cf
parent001afbefb6674d86ed2fb5d8f1cb561e82dc8b86 (diff)
parentfc8952ab632a3f1a56e384a54870198bdf7f023f (diff)
Merge pull request #758 from J0WI/tweak-travis
Allow failures on PHP 7.3 with i386
-rw-r--r--.travis.yml11
1 files changed, 10 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index 00485317..df88778c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,6 +5,11 @@ branches:
only:
- master
+# preload images to avoid timeouts in tests
+before_install:
+ - docker pull mariadb:10
+ - docker pull postgres:11-alpine
+
install:
- git clone https://github.com/docker-library/official-images.git ~/official-images
@@ -20,7 +25,7 @@ script:
set -Eeuo pipefail
set -x
travis_retry docker build -t "$image" "${VERSION}/${VARIANT}"
- ~/official-images/test/run.sh "$image"
+ travis_retry ~/official-images/test/run.sh "$image"
.travis/test-example-dockerfiles.sh "$image"
)
@@ -28,6 +33,10 @@ after_script:
- docker images
jobs:
+ # https://github.com/docker-library/php/issues/822
+ allow_failures:
+ - env: VERSION=15.0 VARIANT=apache ARCH=i386
+ - env: VERSION=16.0 VARIANT=apache ARCH=i386
include:
- &test-scripts
stage: test scripts