From bbc455489adaec3160cd3820a02da29a6547cd5b Mon Sep 17 00:00:00 2001 From: diosmosis <benaka@piwik.pro> Date: Fri, 16 Jan 2015 10:14:50 -0800 Subject: [PATCH] In travis, if minimum required piwik is greater than current version in master, test against master. --- tests/travis/get_required_piwik_version.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/travis/get_required_piwik_version.php b/tests/travis/get_required_piwik_version.php index 4a7197673b..f815bc30d9 100644 --- a/tests/travis/get_required_piwik_version.php +++ b/tests/travis/get_required_piwik_version.php @@ -7,6 +7,8 @@ */ // tiny script to get plugin version from plugin.json from a bash script +require_once __DIR__ . '/../../core/Version.php'; + $pluginName = $argv[1]; $pluginJsonPath = __DIR__ . "/../../plugins/$pluginName/plugin.json"; @@ -20,6 +22,7 @@ if (empty($minimumRequiredPiwik)) { } else { if (!preg_match("/^[^0-9]*(.*)/", $minimumRequiredPiwik, $matches) || empty($matches[1]) + || version_compare($matches[1], \Piwik\Version::VERSION) > 0 ) { $minimumRequiredPiwik = "master"; } else { -- GitLab