From 033817af84e9b3880a9eabb1e047159723f0385e Mon Sep 17 00:00:00 2001 From: Alex Lushpai Date: Thu, 17 Oct 2019 13:40:32 +0300 Subject: [PATCH 1/2] fix version & travis config --- .travis.yml | 38 +++++++++++++++++++++++++++-------- CHACNGELOG.md => CHANGELOG.md | 0 VERSION | 2 +- 3 files changed, 31 insertions(+), 9 deletions(-) rename CHACNGELOG.md => CHANGELOG.md (100%) diff --git a/.travis.yml b/.travis.yml index af1e024..087700f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,6 +15,28 @@ env: matrix: include: + + - php: 7.1 + env: BRANCH=2.2.5 + - php: 7.2 + env: BRANCH=2.2.5 + - php: 7.3 + env: BRANCH=2.2.5 + + - php: 7.1 + env: BRANCH=2.2.6 + - php: 7.2 + env: BRANCH=2.2.6 + - php: 7.3 + env: BRANCH=2.2.6 + + - php: 7.1 + env: BRANCH=2.2.7 + - php: 7.2 + env: BRANCH=2.2.7 + - php: 7.3 + env: BRANCH=2.2.7 + - php: 7.1 env: BRANCH=2.2.8 - php: 7.2 @@ -28,11 +50,11 @@ before_script: script: - bash bin/script.sh -deploy: - skip_cleanup: true - provider: script - script: make - on: - php: 7.2 - branch: master - condition: "$DEPLOY = true" +# deploy: +# skip_cleanup: true +# provider: script +# script: make +# on: +# php: 7.2 +# branch: master +# condition: "$DEPLOY = true" diff --git a/CHACNGELOG.md b/CHANGELOG.md similarity index 100% rename from CHACNGELOG.md rename to CHANGELOG.md diff --git a/VERSION b/VERSION index fad066f..437459c 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.5.0 \ No newline at end of file +2.5.0 From cd1061dfd13132d83f739ac3d5f0ab6e9c908271 Mon Sep 17 00:00:00 2001 From: Alex Lushpai Date: Thu, 17 Oct 2019 14:23:19 +0300 Subject: [PATCH 2/2] update php version for travis --- .travis.yml | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/.travis.yml b/.travis.yml index 087700f..2e243df 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,32 +16,24 @@ env: matrix: include: + - php: 7.0 + env: BRANCH=2.2.5 - php: 7.1 env: BRANCH=2.2.5 - - php: 7.2 - env: BRANCH=2.2.5 - - php: 7.3 - 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 - - php: 7.3 - 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 - - php: 7.3 - env: BRANCH=2.2.7 - - php: 7.1 + - php: 7.0 env: BRANCH=2.2.8 - - php: 7.2 - env: BRANCH=2.2.8 - - php: 7.3 + - php: 7.1 env: BRANCH=2.2.8 before_script: