diff options
author | diosmosis <benaka@piwik.pro> | 2015-07-18 02:04:29 +0300 |
---|---|---|
committer | diosmosis <benaka@piwik.pro> | 2015-07-18 02:04:29 +0300 |
commit | caaa6d039492a1c1b0b94c0e632855eeaf90bdef (patch) | |
tree | c7b9a87bb151262f98921973bc414e1e0200c013 /plugins/TestRunner | |
parent | 910fae4f1ee7af3543cdaeb4dbd95930a10da220 (diff) |
Exclude correct php versions in generated .travis.yml and fetch tags before getting latest stable version in .travis.yml generator.
Diffstat (limited to 'plugins/TestRunner')
-rw-r--r-- | plugins/TestRunner/TravisYml/Generator/PluginTravisYmlGenerator.php | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/plugins/TestRunner/TravisYml/Generator/PluginTravisYmlGenerator.php b/plugins/TestRunner/TravisYml/Generator/PluginTravisYmlGenerator.php index e5394e2308..4e55b5f907 100644 --- a/plugins/TestRunner/TravisYml/Generator/PluginTravisYmlGenerator.php +++ b/plugins/TestRunner/TravisYml/Generator/PluginTravisYmlGenerator.php @@ -75,7 +75,7 @@ class PluginTravisYmlGenerator extends Generator 'vars' => "MYSQL_ADAPTER=PDO_MYSQL TEST_AGAINST_CORE=minimum_required_piwik"); $testsToExclude[] = array('description' => 'execute latest stable tests only w/ PHP 5.6', - 'php' => '5.3', + 'php' => '5.3.3', 'env' => 'TEST_SUITE=PluginTests MYSQL_ADAPTER=PDO_MYSQL TEST_AGAINST_CORE=minimum_required_piwik'); } @@ -84,7 +84,7 @@ class PluginTravisYmlGenerator extends Generator 'vars' => "MYSQL_ADAPTER=PDO_MYSQL TEST_AGAINST_PIWIK_BRANCH=\$PIWIK_LATEST_STABLE_TEST_TARGET"); $testsToExclude[] = array('description' => 'execute UI tests only w/ PHP 5.6', - 'php' => '5.3', + 'php' => '5.3.3', 'env' => 'TEST_SUITE=UITests MYSQL_ADAPTER=PDO_MYSQL TEST_AGAINST_PIWIK_BRANCH=$PIWIK_LATEST_STABLE_TEST_TARGET'); } @@ -124,7 +124,9 @@ class PluginTravisYmlGenerator extends Generator private function getLatestStableVersion() { - $tags = shell_exec("git tag -l " . PIWIK_INCLUDE_PATH); + shell_exec("cd '" . PIWIK_INCLUDE_PATH . "' && git fetch --tags"); + + $tags = shell_exec("cd '" . PIWIK_INCLUDE_PATH . "' && git tag -l "); $tags = explode("\n", $tags); $tags = array_map('trim', $tags); $tags = array_filter($tags, function ($value) { |