From 66937a0d93e7f4f41f0887c412003444f5e7aa4d Mon Sep 17 00:00:00 2001 From: Stanislas Date: Fri, 25 Sep 2020 12:08:24 +0200 Subject: [PATCH] fix(travis): update travis.yml Signed-off-by: Stanislas --- .travis.yml | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1c5885ad..9f2b56dc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,8 @@ # dist: trusty language: php - -sudo: required +os : linux +dist: xenial services: - mysql @@ -23,7 +23,7 @@ env: - PATCH_ARGS="-p1 -N --batch" - AFTER_SUCCESS_BRANCH=9.3/bugfixes - secure: Y9sG3lZ3Fn3t5BXvcMJQxWsdSUVQgF4M08E6oouYrRc95HEj3ZwZOqp6Df58u8CQFA0EKJyvCBLn8UicvHGMKAD0RwGLBdSP4Ji9gJRZkyMZi79awSshdva/c8dqVQrRd4asuTNQfcagVJpNDnY8sYusw504JUilK3vFVp+39nNZUkcvT69NGVIlXzgHTYinBkVuqDhf5eVtcLcaESLEshrg+5ZERdm+0KifdJVREzhicJxofnmTl/wBsIP7XiQqspljf2/SxLqreGmWXYXUfqIwIOVtsd9fkZChQCz8USC7P427tH6styRDYuMCtvA9b/T/XacSdKFbuDezff3NbIM3b5BebDyCrOK5MGSOdRUY5RuyZN4R5LjePUE++9QNCUPeDSkfb23v0VfuqXIRAxfdtik517GzFy6O7/e6FU1msVZlGQED7Uek9nqnupj+0lIq+99Jcm1UCNJu1NTL2Tv80XXqySaxyE4Sedq/FiYAsy1bo2cg2367I2b4FhFXaJCKkFHcdjHXAeurkRy/brSPhBNoOO5/GA3RepUErgly4P8TLZqHNZv8rgMUoQ88sdwDyXG7dY4UwWiTlCkxMBTqBqJanlTMA9zn2bYyMDioTGnA7+VYAA8cddjFOMVrmmuFJ+YV2x1+5B5qd+Wt8RPwcPQDyqaiN5amb1HGeMA= - matrix: + jobs: - GLPI_BRANCH=9.4/bugfixes FI_BRANCH=glpi9.4+1.1 - GLPI_BRANCH=9.5/bugfixes FI_BRANCH=glpi9.5 - GLPI_BRANCH=master FI_BRANCH=master @@ -34,18 +34,23 @@ php: - 7.1 - 7.2 - 7.3 + - 7.4 - nightly -matrix: + +jobs: exclude: - - GLPI_BRANCH=9.5/bugfixes - php: 5.6 - - master - php: 5.6 + - php: 5.6 + env: GLPI_BRANCH=9.5/bugfixes + - php: 7.0 + env: GLPI_BRANCH=9.5/bugfixes + - php: 7.1 + env: GLPI_BRANCH=9.5/bugfixes allow_failures: - php: nightly - - env: GLPI_BRANCH=master FI_BRANCH=master - +# - env: GLPI_BRANCH=9.5/bugfixes +# - env: GLPI_BRANCH=master + before_install: - | if [ "$TRAVIS_SECURE_ENV_VARS" = "true" ]; then