From 15e0c3bd3ef62887a111f23b1e3a60d784b67795 Mon Sep 17 00:00:00 2001 From: J0WI Date: Mon, 17 Jun 2019 19:48:58 +0200 Subject: [PATCH 1/2] Allow failures on PHP 7.3 with i386 Signed-off-by: J0WI --- .travis.yml | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 0048531..0db3d74 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,13 +25,21 @@ 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" ) after_script: - docker images +# https://github.com/docker-library/php/issues/822 +matrix: + allow_failures: + - env: ARCH=i386 + - env: VARIANT=apache + env: VERSION=15.0 + env: VERSION=16.0 + jobs: include: - &test-scripts From fc8952ab632a3f1a56e384a54870198bdf7f023f Mon Sep 17 00:00:00 2001 From: Tilo Spannagel Date: Tue, 18 Jun 2019 14:50:35 +0200 Subject: [PATCH 2/2] Move allow_failures into jobs Signed-off-by: Tilo Spannagel --- .travis.yml | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0db3d74..df88778 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,15 +32,11 @@ script: after_script: - docker images -# https://github.com/docker-library/php/issues/822 -matrix: - allow_failures: - - env: ARCH=i386 - - env: VARIANT=apache - env: VERSION=15.0 - env: VERSION=16.0 - 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