From 727d8a12c0b372b1f101686f0d68d0d6bc760fb3 Mon Sep 17 00:00:00 2001 From: Daniel Rudolf Date: Sun, 29 Mar 2020 14:58:00 +0200 Subject: [PATCH] Fix Travis CI trying to build Pico 3.0 on PHP 5.x --- .travis.yml | 17 ++++------------- composer.json | 2 +- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/.travis.yml b/.travis.yml index 12bd149..8aa14fc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,14 +10,6 @@ cache: jobs: include: # Test stage - - php: 5.3 - dist: precise - - php: 5.4 - dist: trusty - - php: 5.5 - dist: trusty - - php: 5.6 - dist: xenial - php: 7.0 dist: xenial - php: 7.1 @@ -25,15 +17,14 @@ jobs: - php: 7.3 - php: 7.4 - php: nightly - - php: hhvm-3.24 # until Dec 2018 - php: hhvm-3.27 # until Sep 2019 - php: hhvm-3.30 # until Nov 2019 # Branch deployment stage - stage: deploy-branch if: type == "push" && tag IS blank - php: 5.3 - dist: precise + php: 7.0 + dist: xenial install: - '[[ ",$DEPLOY_PHPDOC_BRANCHES," == *,"$TRAVIS_BRANCH",* ]] || travis_terminate 0' - install.sh --deploy @@ -43,8 +34,8 @@ jobs: # Release deployment stage - stage: deploy-release if: tag IS present - php: 5.3 - dist: precise + php: 7.0 + dist: xenial install: - install.sh --deploy script: diff --git a/composer.json b/composer.json index 6e56b5c..de1bcfb 100644 --- a/composer.json +++ b/composer.json @@ -31,7 +31,7 @@ "source": "https://github.com/picocms/Pico" }, "require": { - "php": "^7.0.8", + "php": ">=7.0.8", "twig/twig": "^2.12", "symfony/yaml" : "^3.4", "erusev/parsedown": "1.7.4",