diff options
| author |   Andreas Fischer <bantu@phpbb.com> | 2014-11-12 21:45:03 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2014-11-12 21:45:03 +0100 |
| commit | 968360fed6ac614e2271942e0df4a70e66be4738 (patch) | |
| tree | 3e33d16c54b3c5dbe0e2948091295ebbb1cc91d8 /travis | |
| parent | Merge pull request #3142 from bantu/ticket/13331 (diff) | |
| download | phpbb-968360fed6ac614e2271942e0df4a70e66be4738.tar.gz phpbb-968360fed6ac614e2271942e0df4a70e66be4738.tar.bz2 phpbb-968360fed6ac614e2271942e0df4a70e66be4738.zip | |
[ticket/13331] Remove travis/sami.conf.php. Use build/sami-checkout.conf.php.
PHPBB3-13331
Diffstat (limited to 'travis')
| -rwxr-xr-x | travis/check-sami-parse-errors.sh | 2 | ||||
| -rw-r--r-- | travis/sami.conf.php | 19 |
2 files changed, 1 insertions, 20 deletions
diff --git a/travis/check-sami-parse-errors.sh b/travis/check-sami-parse-errors.sh index 847c54a61a..c3338e34db 100755 --- a/travis/check-sami-parse-errors.sh +++ b/travis/check-sami-parse-errors.sh @@ -20,7 +20,7 @@ then # and # https://github.com/fabpot/Sami/issues/117 errors=$( - unbuffer phpBB/vendor/bin/sami.php parse travis/sami.conf.php -v | \ + unbuffer phpBB/vendor/bin/sami.php parse build/sami-checkout.conf.php -v | \ sed "s,\x1B\[[0-9;]*[a-zA-Z],,g" | \ grep "ERROR: " | \ tee /dev/tty | \ diff --git a/travis/sami.conf.php b/travis/sami.conf.php deleted file mode 100644 index 8e7cfa42e9..0000000000 --- a/travis/sami.conf.php +++ /dev/null @@ -1,19 +0,0 @@ -<?php -/** -* -* This file is part of the phpBB Forum Software package. -* -* @copyright (c) phpBB Limited <https://www.phpbb.com> -* @license GNU General Public License, version 2 (GPL-2.0) -* -* For full copyright and license information, please see -* the docs/CREDITS.txt file. -* -*/ - -require __DIR__ . '/../build/' . basename(__FILE__); - -// Removing the versions array key will make Sami use the current branch. -unset($config['versions']); - -return new Sami\Sami($iterator, $config); |