diff options
| author | sgiehl <stefan@piwik.org> | 2016-11-21 00:35:51 +0300 |
|---|---|---|
| committer | sgiehl <stefan@piwik.org> | 2016-11-21 00:35:51 +0300 |
| commit | 18a05ca54966e945d92e1deb8c93b910a27a9483 (patch) | |
| tree | 085adffe9a771a4a243f9087823e98080de6a92e /.travis.yml | |
| parent | f41820399921b4e65810e5395010d3746bba6fdd (diff) | |
update travis submodule
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/.travis.yml b/.travis.yml index a821c6294d..cd4431bcf5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -78,24 +78,21 @@ matrix: # AngularJS tests need to run only on one PHP version - php: 5.5 env: TEST_SUITE=AngularJSTests MYSQL_ADAPTER=PDO_MYSQL SKIP_COMPOSER_INSTALL=1 - + sudo: required script: $PIWIK_ROOT_DIR/tests/travis/travis.sh -cache: - directories: - - "travis_phantomjs" - 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' - ./tests/travis/install_git_lfs.sh install: - git fetch -q - # Disable it until this is in master, otherwise we have to create a branch for travis submodule - #- export GENERATE_TRAVIS_YML_COMMAND="php ./tests/travis/generator/main.php generate:travis-yml --core --verbose" - #- '[[ "$TRAVIS_JOB_NUMBER" != *.1 || "$TRAVIS_PULL_REQUEST" != "false" ]] || ./tests/travis/autoupdate_travis_yml.sh' + - export GENERATE_TRAVIS_YML_COMMAND="php ./tests/travis/generator/main.php generate:travis-yml --core --verbose" + - '[[ "$TRAVIS_JOB_NUMBER" != *.1 || "$TRAVIS_PULL_REQUEST" != "false" ]] || ./tests/travis/autoupdate_travis_yml.sh' - ./tests/travis/configure_git.sh @@ -148,8 +145,7 @@ before_script: - ./tests/travis/prepare.sh - ./tests/travis/setup_webserver.sh - - ./tests/travis/install_phantomjs.sh - - export PATH=$PWD/travis_phantomjs/phantomjs-2.1.1-linux-x86_64/bin:$PATH + - if [[ "$TRAVIS_PHP_VERSION" != 5.3* ]]; then ./tests/travis/install_phantomjs.sh; export PATH=$PWD/travis_phantomjs/phantomjs-2.1.1-linux-x86_64/bin:$PATH; fi - cd tests/PHPUnit @@ -170,6 +166,12 @@ after_success: - cd $PIWIK_ROOT_DIR - ./tests/travis/generate_docs.sh +cache: + directories: + - "travis_phantomjs" + + + notifications: slack: rooms: @@ -185,4 +187,4 @@ notifications: - "irc.freenode.org#piwik-dev" template: - "%{repository} (%{commit}) : %{message} %{foo} " - - "Build details: %{build_url}" + - "Build details: %{build_url}"
\ No newline at end of file |