Skip to content
This repository was archived by the owner on Mar 4, 2020. It is now read-only.

Commit 371bc9f

Browse files
committed
Run tests on ubuntu xenial
1 parent d600f7e commit 371bc9f

File tree

2 files changed

+4
-8
lines changed

2 files changed

+4
-8
lines changed

.travis-php74.ini

Lines changed: 0 additions & 1 deletion
This file was deleted.

.travis.yml

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
language: php
2-
sudo: false
3-
dist: trusty
2+
dist: xenial
43

54
php:
65
- '5.6'
@@ -16,6 +15,9 @@ env:
1615
- BROWSER_NAME="htmlunit"
1716
- SELENIUM_SERVER="https://selenium-release.storage.googleapis.com/3.14/selenium-server-standalone-3.14.0.jar" # Latest version including HtmlUnit
1817

18+
services:
19+
- xvfb
20+
1921
matrix:
2022
include:
2123
# Codestyle check build
@@ -24,7 +26,6 @@ matrix:
2426
env: CHECK_CODESTYLE=1
2527
before_install:
2628
- phpenv config-rm xdebug.ini
27-
- phpenv config-add .travis-php74.ini
2829
before_script: ~
2930
script:
3031
- composer require phpstan/phpstan # Not part of require-dev, because it won't install on PHP 5.6
@@ -132,9 +133,6 @@ cache:
132133
directories:
133134
- $HOME/.composer/cache
134135

135-
before_install:
136-
- if [ "$TRAVIS_PHP_VERSION" == "7.4" ]; then phpenv config-add .travis-php74.ini; fi
137-
138136
install:
139137
- travis_retry composer self-update
140138
- travis_retry composer update --no-interaction $DEPENDENCIES
@@ -149,7 +147,6 @@ before_script:
149147
fi
150148
- if [ "$BROWSER_NAME" = "chrome" ]; then export CHROMEDRIVER_PATH=$PWD/chromedriver/chromedriver; fi
151149
- if [ "$GECKODRIVER" = "1" ]; then mkdir -p geckodriver; wget -q -t 3 https://github.com/mozilla/geckodriver/releases/download/v0.26.0/geckodriver-v0.26.0-linux64.tar.gz; tar xzf geckodriver-v0.26.0-linux64.tar.gz -C geckodriver; fi
152-
- sh -e /etc/init.d/xvfb start # TODO: start only when needed (ie. not in headless mode)
153150
- if [ ! -f jar/selenium-server-standalone.jar ] && [ -n "$SELENIUM_SERVER" ]; then
154151
mkdir -p jar;
155152
if [ "$SELENIUM_SERVER" = "legacy" ]; then

0 commit comments

Comments
 (0)