From 76b95752bf3eb5a107e0ca5053e229c06549d404 Mon Sep 17 00:00:00 2001 From: Mahmoud Zalt Date: Fri, 6 Apr 2018 17:24:11 +0300 Subject: [PATCH] fix travis tests --- .gitlab-ci.yml | 32 ++++++++++++++++---------------- .travis.yml | 24 ++++++++++++------------ 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 520574e7..41f37b9b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -13,50 +13,50 @@ before_script: - cat .env - env | sort -build:56:php-fpm: +build:5.6:php-fpm: variables: - PHP_VERSION: "56" + PHP_VERSION: "5.6" script: - docker-compose build php-fpm -build:70:php-fpm: +build:7.0:php-fpm: variables: - PHP_VERSION: "70" + PHP_VERSION: "7.0" script: - docker-compose build php-fpm -build:71:php-fpm: +build:7.1:php-fpm: variables: - PHP_VERSION: "71" + PHP_VERSION: "7.1" script: - docker-compose build php-fpm -build:72:php-fpm: +build:7.2:php-fpm: variables: - PHP_VERSION: "72" + PHP_VERSION: "7.2" script: - docker-compose build php-fpm -build:56:workspace: +build:5.6:workspace: variables: - PHP_VERSION: "56" + PHP_VERSION: "5.6" script: - docker-compose build workspace -build:70:workspace: +build:7.0:workspace: variables: - PHP_VERSION: "70" + PHP_VERSION: "7.0" script: - docker-compose build workspace -build:71:workspace: +build:7.1:workspace: variables: - PHP_VERSION: "71" + PHP_VERSION: "7.1" script: - docker-compose build workspace -build:72:workspace: +build:7.2:workspace: variables: - PHP_VERSION: "72" + PHP_VERSION: "7.2" script: - docker-compose build workspace diff --git a/.travis.yml b/.travis.yml index f1f8f189..53e43cea 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,22 +7,22 @@ env: matrix: - HUGO_VERSION=0.20.2 - - PHP_VERSION=56 BUILD_SERVICE=workspace - - PHP_VERSION=70 BUILD_SERVICE=workspace - - PHP_VERSION=71 BUILD_SERVICE=workspace - - PHP_VERSION=72 BUILD_SERVICE=workspace + - PHP_VERSION=5.6 BUILD_SERVICE=workspace + - PHP_VERSION=7.0 BUILD_SERVICE=workspace + - PHP_VERSION=7.1 BUILD_SERVICE=workspace + - PHP_VERSION=7.2 BUILD_SERVICE=workspace - - PHP_VERSION=56 BUILD_SERVICE=php-fpm - - PHP_VERSION=70 BUILD_SERVICE=php-fpm - - PHP_VERSION=71 BUILD_SERVICE=php-fpm - - PHP_VERSION=72 BUILD_SERVICE=php-fpm + - PHP_VERSION=5.6 BUILD_SERVICE=php-fpm + - PHP_VERSION=7.0 BUILD_SERVICE=php-fpm + - PHP_VERSION=7.1 BUILD_SERVICE=php-fpm + - PHP_VERSION=7.2 BUILD_SERVICE=php-fpm - PHP_VERSION=hhvm BUILD_SERVICE=hhvm - # - PHP_VERSION=56 BUILD_SERVICE=php-worker - - PHP_VERSION=70 BUILD_SERVICE=php-worker - - PHP_VERSION=71 BUILD_SERVICE=php-worker - - PHP_VERSION=72 BUILD_SERVICE=php-worker + # - PHP_VERSION=5.6 BUILD_SERVICE=php-worker + - PHP_VERSION=7.0 BUILD_SERVICE=php-worker + - PHP_VERSION=7.1 BUILD_SERVICE=php-worker + - PHP_VERSION=7.2 BUILD_SERVICE=php-worker - PHP_VERSION=NA BUILD_SERVICE=solr - PHP_VERSION=NA BUILD_SERVICE="mssql rethinkdb aerospike"