Merge pull request #758 from J0WI/tweak-travis

Allow failures on PHP 7.3 with i386
This commit is contained in:
Tilo Spannagel 2019-06-18 16:33:55 +02:00 committed by GitHub
commit 17a6790ac8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 1 deletions

View File

@ -5,6 +5,11 @@ branches:
only: only:
- master - master
# preload images to avoid timeouts in tests
before_install:
- docker pull mariadb:10
- docker pull postgres:11-alpine
install: install:
- git clone https://github.com/docker-library/official-images.git ~/official-images - git clone https://github.com/docker-library/official-images.git ~/official-images
@ -20,7 +25,7 @@ script:
set -Eeuo pipefail set -Eeuo pipefail
set -x set -x
travis_retry docker build -t "$image" "${VERSION}/${VARIANT}" 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" .travis/test-example-dockerfiles.sh "$image"
) )
@ -28,6 +33,10 @@ after_script:
- docker images - docker images
jobs: 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: include:
- &test-scripts - &test-scripts
stage: test scripts stage: test scripts