Skip to content

Commit d18d540

Browse files
committed
Update .travis.yml and prepare-phpbb.sh
1 parent eede301 commit d18d540

File tree

2 files changed

+17
-4
lines changed

2 files changed

+17
-4
lines changed

.travis.yml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# Opt into fully virtualized infrastructure
2+
sudo: required
3+
14
language: php
25

36
matrix:
@@ -31,15 +34,19 @@ env:
3134
- EXTNAME="phpbbde/movemessage" # CHANGE name of the extension HERE
3235
- SNIFF="1" # Should we run code sniffer on your code?
3336
- IMAGE_ICC="1" # Should we run icc profile sniffer on your images?
34-
- PHPBB_BRANCH="develop-ascraeus"
37+
- EPV="1" # Should we run EPV (Extension Pre Validator) on your code?
38+
- PHPBB_BRANCH="3.1.x"
3539

3640
branches:
3741
only:
3842
- master
3943
- develop
4044
- /^develop-.*$/
45+
- /^release-.*$/
4146

4247
install:
48+
- travis_retry composer self-update
49+
- travis_retry composer install --no-interaction --prefer-source
4350
- travis/prepare-phpbb.sh $EXTNAME $PHPBB_BRANCH
4451
- cd ../../phpBB3
4552
- travis/prepare-extension.sh $EXTNAME $PHPBB_BRANCH
@@ -52,3 +59,4 @@ script:
5259
- sh -c "if [ '$SNIFF' != '0' ]; then travis/ext-sniff.sh $DB $TRAVIS_PHP_VERSION $EXTNAME; fi"
5360
- sh -c "if [ '$IMAGE_ICC' != '0' ]; then travis/check-image-icc-profiles.sh $DB $TRAVIS_PHP_VERSION; fi"
5461
- phpBB/vendor/bin/phpunit --configuration phpBB/ext/$EXTNAME/travis/phpunit-$DB-travis.xml --bootstrap ./tests/bootstrap.php
62+
- sh -c "if [ '$EPV' != '0' ] && [ '$TRAVIS_PHP_VERSION' = '5.3.3' ] && [ '$DB' = 'mysqli' ]; then phpBB/ext/$EXTNAME/vendor/bin/EPV.php run --dir='phpBB/ext/$EXTNAME/'; fi"

travis/prepare-phpbb.sh

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
11
#!/bin/bash
22
#
3-
# @copyright (c) 2014 phpBB Group
4-
# @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
3+
# This file is part of the phpBB Forum Software package.
4+
#
5+
# @copyright (c) phpBB Limited <https://www.phpbb.com>
6+
# @license GNU General Public License, version 2 (GPL-2.0)
7+
#
8+
# For full copyright and license information, please see
9+
# the docs/CREDITS.txt file.
510
#
611
set -e
712
set -x
@@ -16,4 +21,4 @@ cp -R . ../../tmp
1621
cd ../../
1722

1823
# Clone phpBB
19-
git clone --depth=1 "git://github.com/nickvergessen/phpbb.git" "phpBB3" --branch=$BRANCH
24+
git clone --depth=1 "git://github.com/phpbb/phpbb.git" "phpBB3" --branch=$BRANCH

0 commit comments

Comments
 (0)