Skip to content

Commit 95facbb

Browse files
authored
Merge pull request #203 from orocrm/fix/BAP-11459
BAP-11459: Fix Travis public builds
2 parents dbb7745 + 1650463 commit 95facbb

File tree

4 files changed

+23
-12
lines changed

4 files changed

+23
-12
lines changed

Diff for: .travis.yml

+10-9
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,26 @@ sudo: false
22

33
language: php
44

5+
branches:
6+
only:
7+
- master
8+
- /^1\.\d+$/
9+
510
php:
611
- 5.5
712
- 5.6
813
- 7.0
914

10-
env:
11-
- SYMFONY_VERSION=2.7.*
12-
1315
cache:
1416
directories:
15-
- $HOME/.composer/cache/files
17+
- $HOME/.composer/cache/
1618

1719
before_script:
1820
- phpenv config-rm xdebug.ini
19-
- composer self-update
2021
- phpenv config-add travis.php.ini
21-
- travis_wait composer require symfony/symfony:${SYMFONY_VERSION} --prefer-source --update-no-dev
22-
- travis_wait composer require squizlabs/php_codesniffer:2.3.3 --prefer-source --update-no-dev
22+
- composer self-update
23+
- composer install
2324

24-
script:
25-
- phpunit
25+
script:
26+
- ./vendor/bin/phpunit --verbose --testsuite=unit
2627
- ./vendor/bin/phpcs ./src -p --encoding=utf-8 --extensions=php --standard=psr2

Diff for: composer.json

+8
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@
1616
}
1717
},
1818
"repositories": [
19+
{
20+
"type": "git",
21+
"url": "https://github.com/orocrm/TranslationFormBundle.git"
22+
},
1923
{
2024
"type": "composer",
2125
"url": "https://packagist.orocrm.com"
@@ -27,6 +31,10 @@
2731
"oro/crm-task-bundle": "1.0.*",
2832
"oro/crm-call-bundle": "1.0.*"
2933
},
34+
"require-dev": {
35+
"squizlabs/php_codesniffer": "2.3.*",
36+
"phpunit/phpunit": "4.8.*"
37+
},
3038
"minimum-stability": "dev",
3139
"prefer-stable": true,
3240
"extra": {

Diff for: phpunit.xml.dist

+4-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,10 @@
1414
bootstrap = "vendor/autoload.php">
1515

1616
<testsuites>
17-
<testsuite name="Project Unit Tests">
18-
<directory suffix="Test.php">src/OroCRM/Bundle/*Bundle/Tests/Unit</directory>
17+
<testsuite name="unit">
18+
<directory suffix="Test.php">src/*/Bundle/*Bundle/Tests/Unit</directory>
19+
<directory suffix="Test.php">src/*/Component/*/Tests/Unit</directory>
20+
<directory suffix="Test.php">src/*/*/Tests/Unit</directory>
1921
</testsuite>
2022
</testsuites>
2123

Diff for: travis.php.ini

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
memory_limit = 2G
1+
memory_limit = 3G

0 commit comments

Comments
 (0)