From fc7c004988a5f4e720c8af11cbf1092360481116 Mon Sep 17 00:00:00 2001 From: Akolzin Dmitry Date: Wed, 19 Feb 2020 18:17:23 +0300 Subject: [PATCH] update matrix, remove deprecated --- .travis.yml | 106 ++++++++++++++++++++++++++++++++++++++++------------ Makefile | 2 +- 2 files changed, 83 insertions(+), 25 deletions(-) diff --git a/.travis.yml b/.travis.yml index 29d961b..ae6f6a6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,9 +1,7 @@ +os: linux language: php - dist: trusty -sudo: false - if: tag IS blank env: @@ -38,29 +36,89 @@ after_success: jobs: include: - php: 7.0 - env: - - TEST_SUITE=2.3 - - OPENCART=2.3 - - php: 7.1 - env: - - TEST_SUITE=2.3 - - OPENCART=2.3 + env: TEST_SUITE=2.3 OPENCART=2.3.0.0 - php: 7.0 - env: - - TEST_SUITE=3.0 - - OPENCART=3.0 + env: TEST_SUITE=2.3 OPENCART=2.3.0.1 + - php: 7.0 + env: TEST_SUITE=2.3 OPENCART=2.3.0.2 - php: 7.1 - env: - - TEST_SUITE=3.0 - - OPENCART=3.0 + env: TEST_SUITE=2.3 OPENCART=2.3.0.0 + - php: 7.1 + env: TEST_SUITE=2.3 OPENCART=2.3.0.1 + - php: 7.1 + env: TEST_SUITE=2.3 OPENCART=2.3.0.2 + - php: 7.0 + env: TEST_SUITE=3.0 OPENCART=3.0.0.0 + - php: 7.0 + env: TEST_SUITE=3.0 OPENCART=3.0.0.2 + - php: 7.0 + env: TEST_SUITE=3.0 OPENCART=3.0.1.0 + - php: 7.0 + env: TEST_SUITE=3.0 OPENCART=3.0.1.1 + - php: 7.0 + env: TEST_SUITE=3.0 OPENCART=3.0.1.2 + - php: 7.0 + env: TEST_SUITE=3.0 OPENCART=3.0.2.0 + - php: 7.0 + env: TEST_SUITE=3.0 OPENCART=3.0.3.0 + - php: 7.0 + env: TEST_SUITE=3.0 OPENCART=3.0.3.1 + - php: 7.0 + env: TEST_SUITE=3.0 OPENCART=3.0.3.2 + - php: 7.1 + env: TEST_SUITE=3.0 OPENCART=3.0.0.0 + - php: 7.1 + env: TEST_SUITE=3.0 OPENCART=3.0.0.2 + - php: 7.1 + env: TEST_SUITE=3.0 OPENCART=3.0.1.0 + - php: 7.1 + env: TEST_SUITE=3.0 OPENCART=3.0.1.1 + - php: 7.1 + env: TEST_SUITE=3.0 OPENCART=3.0.1.2 + - php: 7.1 + env: TEST_SUITE=3.0 OPENCART=3.0.2.0 + - php: 7.1 + env: TEST_SUITE=3.0 OPENCART=3.0.3.0 + - php: 7.1 + env: TEST_SUITE=3.0 OPENCART=3.0.3.1 + - php: 7.1 + env: TEST_SUITE=3.0 OPENCART=3.0.3.2 - php: 7.2 - env: - - TEST_SUITE=3.0 - - OPENCART=3.0 + env: TEST_SUITE=3.0 OPENCART=3.0.0.0 + - php: 7.2 + env: TEST_SUITE=3.0 OPENCART=3.0.0.2 + - php: 7.2 + env: TEST_SUITE=3.0 OPENCART=3.0.1.0 + - php: 7.2 + env: TEST_SUITE=3.0 OPENCART=3.0.1.1 + - php: 7.2 + env: TEST_SUITE=3.0 OPENCART=3.0.1.2 + - php: 7.2 + env: TEST_SUITE=3.0 OPENCART=3.0.2.0 + - php: 7.2 + env: TEST_SUITE=3.0 OPENCART=3.0.3.0 + - php: 7.2 + env: TEST_SUITE=3.0 OPENCART=3.0.3.1 + - php: 7.2 + env: TEST_SUITE=3.0 OPENCART=3.0.3.2 - php: 7.3 - env: - - TEST_SUITE=3.0 - - OPENCART=3.0 + env: TEST_SUITE=3.0 OPENCART=3.0.0.0 + - php: 7.3 + env: TEST_SUITE=3.0 OPENCART=3.0.0.2 + - php: 7.3 + env: TEST_SUITE=3.0 OPENCART=3.0.1.0 + - php: 7.3 + env: TEST_SUITE=3.0 OPENCART=3.0.1.1 + - php: 7.3 + env: TEST_SUITE=3.0 OPENCART=3.0.1.2 + - php: 7.3 + env: TEST_SUITE=3.0 OPENCART=3.0.2.0 + - php: 7.3 + env: TEST_SUITE=3.0 OPENCART=3.0.3.0 + - php: 7.3 + env: TEST_SUITE=3.0 OPENCART=3.0.3.1 + - php: 7.3 + env: TEST_SUITE=3.0 OPENCART=3.0.3.2 - stage: deploy before_script: skip script: make build_archive @@ -73,8 +131,8 @@ jobs: - git tag $TRAVIS_TAG deploy: provider: releases - api_key: $GITHUB_OAUTH_TOKEN - skip_cleanup: true + token: $GITHUB_OAUTH_TOKEN + cleanup: false file: $ARCHIVE_NAME on: condition: "$LAST_TAG != $CURRENT_VERSION" diff --git a/Makefile b/Makefile index d696803..a495dad 100644 --- a/Makefile +++ b/Makefile @@ -18,7 +18,7 @@ before_script: # Change MySQL root password echo "USE mysql;\nUPDATE user SET password=PASSWORD('root') WHERE user='root';\nFLUSH PRIVILEGES;\n" | mysql -u root composer require --dev beyondit/opencart-test-suite ~$(TEST_SUITE) - composer require --dev opencart/opencart ~$(OPENCART) + composer require --dev opencart/opencart $(OPENCART) composer setup bin/robo --load-from tests/RoboFile.php project:deploy (php -S localhost:8000 -t www &) 2> /dev/null > /dev/null