diff options
| author | mattab <matthieu.aubry@gmail.com> | 2014-08-14 00:38:28 +0400 |
|---|---|---|
| committer | mattab <matthieu.aubry@gmail.com> | 2014-08-14 00:38:28 +0400 |
| commit | 0ae7ddda803a65677f2b39cf3a2cfc042b41b6d8 (patch) | |
| tree | ff09800d732afadc852bb6874d3ac353a504777b | |
| parent | a23de60c96e6fa6b2ba656d6aab2ecf57f4b4a7f (diff) | |
| parent | 261e5c5e66f07b65aecb0473d0704f332355aae8 (diff) | |
Merge branch 'master' of github.com:piwik/piwik
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | plugins/CoreConsole/templates/travis.yml.twig | 2 | ||||
| -rwxr-xr-x | tests/travis/checkout_dependent_plugins.sh | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index 9604132289..95003d4a40 100644 --- a/.travis.yml +++ b/.travis.yml @@ -88,7 +88,7 @@ before_install: install: # make sure travis test scripts are always latest (so in older releases/branches, the latest scripts will still be used) - git fetch - - git checkout master -- ./tests/travis ./plugins/CoreConsole + - git checkout master -- ./tests/travis ./plugins/CoreConsole || true before_script: - ./tests/travis/configure_git.sh diff --git a/plugins/CoreConsole/templates/travis.yml.twig b/plugins/CoreConsole/templates/travis.yml.twig index 569439de42..6b52f22558 100644 --- a/plugins/CoreConsole/templates/travis.yml.twig +++ b/plugins/CoreConsole/templates/travis.yml.twig @@ -92,7 +92,7 @@ install: {% else %} # make sure travis test scripts are always latest (so in older releases/branches, the latest scripts will still be used) - git fetch - - git checkout master -- ./tests/travis ./plugins/CoreConsole + - git checkout master -- ./tests/travis ./plugins/CoreConsole || true {% endif %} before_script: diff --git a/tests/travis/checkout_dependent_plugins.sh b/tests/travis/checkout_dependent_plugins.sh index 08b3fb4955..833c09d931 100755 --- a/tests/travis/checkout_dependent_plugins.sh +++ b/tests/travis/checkout_dependent_plugins.sh @@ -8,7 +8,7 @@ else echo "Cloning dependent plugins..." echo "" - for pluginSlug in "${DEPENDENT_PLUGINS[@]}" + for pluginSlug in $DEPENDENT_PLUGINS do dependentPluginName=`echo "$pluginSlug" | sed -E 's/PiwikPRO\/[a-zA-Z0-9_]+-(.*)/\1/'` @@ -16,7 +16,7 @@ else git clone --depth=1 "https://$GITHUB_USER_TOKEN:@github.com/$pluginSlug" "plugins/$dependentPluginName" 2> /dev/null done - echo "Plugin directory" + echo "Plugin directory:" echo "" ls -d plugins/* |