diff options
| author |   Nils Adermann <naderman@naderman.de> | 2014-02-04 13:05:20 +0100 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2014-02-04 13:05:20 +0100 |
| commit | 1a31f03a7b89e2a88f188e9f68c96469aa40be79 (patch) | |
| tree | 95a2abfa19fa9c8666534404b9ecffe41059f9a3 /.travis.yml | |
| parent | Merge pull request #1998 from bantu/ticket/12141 (diff) | |
| parent | Merge remote-tracking branch 'github-nickvergessen/ticket/12162' into develop... (diff) | |
| download | phpbb-1a31f03a7b89e2a88f188e9f68c96469aa40be79.tar.gz phpbb-1a31f03a7b89e2a88f188e9f68c96469aa40be79.tar.bz2 phpbb-1a31f03a7b89e2a88f188e9f68c96469aa40be79.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/12162] Set language to C before running diff to ensure its english
[ticket/11509] Be exact when referencing the branch name.
[ticket/12161] Do not use subdirectories in build/save directory.
[ticket/11509] Run commit message checker only in one environment.
[ticket/11509] Contrary to docs, COMMIT_RANGE is not available in PR mode.
Conflicts:
.travis.yml
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index aecd097370..3317024ded 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,11 +28,12 @@ before_script: - sh -c "if [ '$DB' = 'mysql' -o '$DB' = 'mariadb' ]; then mysql -e 'create database IF NOT EXISTS phpbb_tests;'; fi" script: +<<<<<<< HEAD - cd build - sh -c "if [ '$TRAVIS_PHP_VERSION' = '5.5' -a '$DB' = 'mysql' ]; then ../phpBB/vendor/bin/phing sniff; fi" - cd .. - phpBB/vendor/bin/phpunit --configuration travis/phpunit-$DB-travis.xml - - sh -c "if [ '$TRAVIS_PULL_REQUEST' != 'false' ]; then git-tools/commit-msg-hook-range.sh $TRAVIS_COMMIT_RANGE; fi" + - sh -c "if [ '$TRAVIS_PHP_VERSION' = '5.5' -a '$DB' = 'mysql' -a '$TRAVIS_PULL_REQUEST' != 'false' ]; then git-tools/commit-msg-hook-range.sh origin/$TRAVIS_BRANCH...FETCH_HEAD; fi" matrix: allow_failures: |