diff options
author | diosmosis <benakamoorthi@fastmail.fm> | 2014-08-13 17:30:25 +0400 |
---|---|---|
committer | diosmosis <benakamoorthi@fastmail.fm> | 2014-08-13 17:31:36 +0400 |
commit | 09239b91d8af5437935ee2a3f950a4e5e5151989 (patch) | |
tree | 14140ee504a8e7d522cc3fdb909b86e46a2d6218 /plugins | |
parent | 83e9d6a62ae2a0a401be9d12b315f6e6bfb20e04 (diff) |
Make sure statement to update travis scripts is always executed before script running is attempted.
Diffstat (limited to 'plugins')
-rw-r--r-- | plugins/CoreConsole/templates/travis.yml.twig | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/plugins/CoreConsole/templates/travis.yml.twig b/plugins/CoreConsole/templates/travis.yml.twig index 48525f999c..bfcbe599d7 100644 --- a/plugins/CoreConsole/templates/travis.yml.twig +++ b/plugins/CoreConsole/templates/travis.yml.twig @@ -53,9 +53,9 @@ script: $PIWIK_ROOT_DIR/tests/travis/travis.sh before_install: # do not use the Zend allocator on PHP 5.3 since it will randomly segfault after program execution - '[[ "$TRAVIS_PHP_VERSION" == 5.3* ]] && export USE_ZEND_ALLOC=0 || true' -{% if pluginName is not empty %} install: +{% if pluginName is not empty %} # move all contents of current repo (which contains the plugin) to a new directory - mkdir $PLUGIN_NAME - cp -R !($PLUGIN_NAME) $PLUGIN_NAME @@ -84,14 +84,17 @@ install: - rm -rf plugins/$PLUGIN_NAME - mv ../$PLUGIN_NAME plugins + # make sure travis test scripts are always latest (so in older releases/branches, the latest scripts will still be used) + - git checkout master ./tests/travis ./plugins/CoreConsole + # clone dependent repos - ./tests/travis/checkout_dependent_plugins.sh -{% endif %} - -before_script: +{% else %} # make sure travis test scripts are always latest (so in older releases/branches, the latest scripts will still be used) - git checkout master ./tests/travis ./plugins/CoreConsole +{% endif %} +before_script: - ./tests/travis/configure_git.sh # print out mysql information |