From 95e765d01ea759d12d14846fd2d973b7ee70174c Mon Sep 17 00:00:00 2001 From: Akolzin Dmitry Date: Mon, 6 Apr 2020 16:36:01 +0300 Subject: [PATCH] Update travis config --- .travis.yml | 404 +++++++++++++++++++++++++++----------------------- Makefile | 8 + bin/script.sh | 9 -- 3 files changed, 224 insertions(+), 197 deletions(-) delete mode 100644 bin/script.sh diff --git a/.travis.yml b/.travis.yml index 5467d85..e251069 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,8 @@ +os: linux +dist: trusty language: php -sudo: false +if: tag IS blank env: global: @@ -13,244 +15,270 @@ env: - ADMIN_USER=admin - ADMIN_PASS=admin123 -matrix: +stages: + - test + +jobs: include: + - php: 7.0 + env: BRANCH=2.0.2 - - php: 5.6 - env: BRANCH=2.0.2 - - php: 7.0 - env: BRANCH=2.0.2 + - php: 7.0 + env: BRANCH=2.0.4 - - php: 5.6 - env: BRANCH=2.0.4 - - php: 7.0 - env: BRANCH=2.0.4 + - php: 7.0 + env: BRANCH=2.0.5 - - php: 5.6 - env: BRANCH=2.0.5 - - php: 7.0 - env: BRANCH=2.0.5 + - php: 7.0 + env: BRANCH=2.0.6 - - php: 5.6 - env: BRANCH=2.0.6 - - php: 7.0 - env: BRANCH=2.0.6 + - php: 7.0 + env: BRANCH=2.0.7 - - php: 5.6 - env: BRANCH=2.0.7 - - php: 7.0 - env: BRANCH=2.0.7 + - php: 7.0 + env: BRANCH=2.0.8 - - php: 5.6 - env: BRANCH=2.0.8 - - php: 7.0 - env: BRANCH=2.0.8 + - php: 7.0 + env: BRANCH=2.0.9 - - php: 5.6 - env: BRANCH=2.0.9 - - php: 7.0 - env: BRANCH=2.0.9 + - php: 7.0 + env: BRANCH=2.0.10 - - php: 5.6 - env: BRANCH=2.0.10 - - php: 7.0 - env: BRANCH=2.0.10 + - php: 7.0 + env: BRANCH=2.0.11 - - php: 5.6 - env: BRANCH=2.0.11 - - php: 7.0 - env: BRANCH=2.0.11 + - php: 7.0 + env: BRANCH=2.0.12 - - php: 5.6 - env: BRANCH=2.0.12 - - php: 7.0 - env: BRANCH=2.0.12 + - php: 7.0 + env: BRANCH=2.0.13 - - php: 5.6 - env: BRANCH=2.0.13 - - php: 7.0 - env: BRANCH=2.0.13 + - php: 7.0 + env: BRANCH=2.0.14 - - php: 5.6 - env: BRANCH=2.0.14 - - php: 7.0 - env: BRANCH=2.0.14 + - php: 7.0 + env: BRANCH=2.0.15 - - php: 5.6 - env: BRANCH=2.0.15 - - php: 7.0 - env: BRANCH=2.0.15 + - php: 7.0 + env: BRANCH=2.0.16 - - php: 5.6 - env: BRANCH=2.0.16 - - php: 7.0 - env: BRANCH=2.0.16 + - php: 7.0 + env: BRANCH=2.0.17 - - php: 5.6 - env: BRANCH=2.0.17 - - php: 7.0 - env: BRANCH=2.0.17 + - php: 7.0 + env: BRANCH=2.0.18 - - php: 5.6 - env: BRANCH=2.0.18 - - php: 7.0 - env: BRANCH=2.0.18 + - php: 7.0 + env: BRANCH=2.1.0 + - php: 7.1 + env: BRANCH=2.1.0 - - php: 7.0 - env: BRANCH=2.1.0 - - php: 7.1 - env: BRANCH=2.1.0 + - php: 7.0 + env: BRANCH=2.1.1 + - php: 7.1 + env: BRANCH=2.1.1 - - php: 7.0 - env: BRANCH=2.1.1 - - php: 7.1 - env: BRANCH=2.1.1 + - php: 7.0 + env: BRANCH=2.1.2 + - php: 7.1 + env: BRANCH=2.1.2 - - php: 7.0 - env: BRANCH=2.1.2 - - php: 7.1 - env: BRANCH=2.1.2 + - php: 7.0 + env: BRANCH=2.1.3 + - php: 7.1 + env: BRANCH=2.1.3 - - php: 7.0 - env: BRANCH=2.1.3 - - php: 7.1 - env: BRANCH=2.1.3 + - php: 7.0 + env: BRANCH=2.1.4 + - php: 7.1 + env: BRANCH=2.1.4 - - php: 7.0 - env: BRANCH=2.1.4 - - php: 7.1 - env: BRANCH=2.1.4 + - php: 7.0 + env: BRANCH=2.1.5 + - php: 7.1 + env: BRANCH=2.1.5 - - php: 7.0 - env: BRANCH=2.1.5 - - php: 7.1 - env: BRANCH=2.1.5 + - php: 7.0 + env: BRANCH=2.1.6 + - php: 7.1 + env: BRANCH=2.1.6 - - php: 7.0 - env: BRANCH=2.1.6 - - php: 7.1 - env: BRANCH=2.1.6 + - php: 7.0 + env: BRANCH=2.1.7 + - php: 7.1 + env: BRANCH=2.1.7 - - php: 7.0 - env: BRANCH=2.1.7 - - php: 7.1 - env: BRANCH=2.1.7 + - php: 7.0 + env: BRANCH=2.1.8 + - php: 7.1 + env: BRANCH=2.1.8 - - php: 7.0 - env: BRANCH=2.1.8 - - php: 7.1 - env: BRANCH=2.1.8 + - php: 7.0 + env: BRANCH=2.1.9 + - php: 7.1 + env: BRANCH=2.1.9 - - php: 7.0 - env: BRANCH=2.1.9 - - php: 7.1 - env: BRANCH=2.1.9 + - php: 7.0 + env: BRANCH=2.1.10 + - php: 7.1 + env: BRANCH=2.1.10 - - php: 7.0 - env: BRANCH=2.1.10 - - php: 7.1 - env: BRANCH=2.1.10 + - php: 7.0 + env: BRANCH=2.1.11 + - php: 7.1 + env: BRANCH=2.1.11 - - php: 7.0 - env: BRANCH=2.1.11 - - php: 7.1 - env: BRANCH=2.1.11 + - php: 7.0 + env: BRANCH=2.1.12 + - php: 7.1 + env: BRANCH=2.1.12 - - php: 7.0 - env: BRANCH=2.1.12 - - php: 7.1 - env: BRANCH=2.1.12 + - php: 7.0 + env: BRANCH=2.1.13 + - php: 7.1 + env: BRANCH=2.1.13 - - php: 7.0 - env: BRANCH=2.1.13 - - php: 7.1 - env: BRANCH=2.1.13 + - php: 7.0 + env: BRANCH=2.1.14 + - php: 7.1 + env: BRANCH=2.1.14 - - php: 7.0 - env: BRANCH=2.1.14 - - php: 7.1 - env: BRANCH=2.1.14 + - php: 7.0 + env: BRANCH=2.1.15 + - php: 7.1 + env: BRANCH=2.1.15 - - php: 7.0 - env: BRANCH=2.1.15 - - php: 7.1 - env: BRANCH=2.1.15 + - php: 7.0 + env: BRANCH=2.1.16 + - php: 7.1 + env: BRANCH=2.1.16 - - php: 7.0 - env: BRANCH=2.1.16 - - php: 7.1 - env: BRANCH=2.1.16 + - php: 7.0 + env: BRANCH=2.1.17 + - php: 7.1 + env: BRANCH=2.1.17 - - php: 7.0 - env: BRANCH=2.1.17 - - php: 7.1 - env: BRANCH=2.1.17 + - php: 7.0 + env: BRANCH=2.1.18 + - php: 7.1 + env: BRANCH=2.1.18 - - php: 7.0 - env: BRANCH=2.1.18 - - php: 7.1 - env: BRANCH=2.1.18 + - php: 7.0 + env: BRANCH=2.2.0 + - php: 7.1 + env: BRANCH=2.2.0 + - php: 7.2 + env: BRANCH=2.2.1 USE_COMPOSER=1 - - php: 7.0 - env: BRANCH=2.2.0 - - php: 7.1 - env: BRANCH=2.2.0 + - php: 7.0 + env: BRANCH=2.2.1 + - php: 7.1 + env: BRANCH=2.2.1 + - php: 7.2 + env: BRANCH=2.2.1 USE_COMPOSER=1 - - php: 7.0 - env: BRANCH=2.2.1 - - php: 7.1 - env: BRANCH=2.2.1 + - php: 7.0 + env: BRANCH=2.2.2 + - php: 7.1 + env: BRANCH=2.2.2 + - php: 7.2 + env: BRANCH=2.2.2 USE_COMPOSER=1 - - php: 7.0 - env: BRANCH=2.2.2 - - php: 7.1 - env: BRANCH=2.2.2 + - php: 7.0 + env: BRANCH=2.2.3 + - php: 7.1 + env: BRANCH=2.2.3 + - php: 7.2 + env: BRANCH=2.2.3 USE_COMPOSER=1 - - php: 7.0 - env: BRANCH=2.2.3 - - php: 7.1 - env: BRANCH=2.2.3 + - php: 7.0 + env: BRANCH=2.2.4 + - php: 7.1 + env: BRANCH=2.2.4 + - php: 7.2 + env: BRANCH=2.2.4 USE_COMPOSER=1 - - php: 7.0 - env: BRANCH=2.2.4 - - php: 7.1 - env: BRANCH=2.2.4 + - php: 7.0 + env: BRANCH=2.2.5 + - php: 7.1 + env: BRANCH=2.2.5 + - php: 7.2 + env: BRANCH=2.2.5 USE_COMPOSER=1 - - php: 7.0 - env: BRANCH=2.2.5 - - php: 7.1 - env: BRANCH=2.2.5 + - php: 7.0 + env: BRANCH=2.2.6 + - php: 7.1 + env: BRANCH=2.2.6 + - php: 7.2 + env: BRANCH=2.2.6 USE_COMPOSER=1 - - php: 7.0 - env: BRANCH=2.2.6 - - php: 7.1 - env: BRANCH=2.2.6 + - php: 7.0 + env: BRANCH=2.2.7 + - php: 7.1 + env: BRANCH=2.2.7 + - php: 7.2 + env: BRANCH=2.2.7 USE_COMPOSER=1 - - php: 7.0 - env: BRANCH=2.2.7 - - php: 7.1 - env: BRANCH=2.2.7 + - php: 7.0 + env: BRANCH=2.2.8 + - php: 7.1 + env: BRANCH=2.2.8 + - php: 7.2 + env: BRANCH=2.2.8 USE_COMPOSER=1 - - php: 7.0 - env: BRANCH=2.2.8 - - php: 7.1 - env: BRANCH=2.2.8 + - php: 7.0 + env: BRANCH=2.2.9 + - php: 7.1 + env: BRANCH=2.2.9 + - php: 7.2 + env: BRANCH=2.2.9 USE_COMPOSER=1 - - php: 7.0 - env: BRANCH=2.2.9 - - php: 7.1 - env: BRANCH=2.2.9 + - php: 7.0 + env: BRANCH=2.2.10 + - php: 7.1 + env: BRANCH=2.2.10 + - php: 7.2 + env: BRANCH=2.2.10 USE_COMPOSER=1 - - php: 7.1 - env: BRANCH=2.2.10 - - php: 7.2 - env: BRANCH=2.2.10 + - php: 7.1 + env: BRANCH=2.3.0 + - php: 7.2 + env: BRANCH=2.3.0 USE_COMPOSER=1 + - php: 7.3 + env: BRANCH=2.3.0 USE_COMPOSER=1 + + - php: 7.1 + env: BRANCH=2.3.1 + - php: 7.2 + env: BRANCH=2.3.1 USE_COMPOSER=1 + - php: 7.3 + env: BRANCH=2.3.1 USE_COMPOSER=1 + + - php: 7.1 + env: BRANCH=2.3.2 + - php: 7.2 + env: BRANCH=2.3.2 USE_COMPOSER=1 + - php: 7.3 + env: BRANCH=2.3.2 USE_COMPOSER=1 + + - php: 7.1 + env: BRANCH=2.3.3 + - php: 7.2 + env: BRANCH=2.3.3 USE_COMPOSER=1 + - php: 7.3 + env: BRANCH=2.3.3 USE_COMPOSER=1 + + - php: 7.1 + env: BRANCH=2.3.4 + - php: 7.2 + env: BRANCH=2.3.4 USE_COMPOSER=1 + - php: 7.3 + env: BRANCH=2.3.4 USE_COMPOSER=1 before_script: - bash bin/install.sh -script: - - bash bin/script.sh +script: make ci # deploy: # skip_cleanup: true diff --git a/Makefile b/Makefile index 957ab84..e25fee2 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,7 @@ FILE = $(TRAVIS_BUILD_DIR)/VERSION VERSION = `cat $(FILE)` ARCHIVE_NAME = '/tmp/retailcrm-retailcrm-'$(VERSION)'.zip' +MAGE_ROOT = $(TRAVIS_BUILD_DIR)/../magento2 all: build_archive send_to_ftp delete_archive @@ -12,3 +13,10 @@ send_to_ftp: delete_archive: rm -f $(ARCHIVE_NAME) + +ci: +ifeq ($(USE_COMPOSER,1)) + php $(MAGE_ROOT)/vendor/phpunit/phpunit/phpunit -c $(MAGE_ROOT)/dev/tests/unit/phpunit.xml.dist $(MAGE_ROOT)/app/code/Retailcrm/Retailcrm/Test/Unit +else + phpunit -c $(MAGE_ROOT)/dev/tests/unit/phpunit.xml.dist $(MAGE_ROOT)/app/code/Retailcrm/Retailcrm/Test/Unit +endif \ No newline at end of file diff --git a/bin/script.sh b/bin/script.sh deleted file mode 100644 index 1e5ebe2..0000000 --- a/bin/script.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env bash - -if [ -z $TRAVIS_BUILD_DIR ]; then - exit 0; -fi - -MAGE_ROOT=$TRAVIS_BUILD_DIR/../magento2 -cd $MAGE_ROOT -php vendor/phpunit/phpunit/phpunit -c dev/tests/unit/phpunit.xml.dist app/code/Retailcrm/Retailcrm/Test/Unit