Skip to content

Commit

Permalink
Merge c2dc958 into e2b077c
Browse files Browse the repository at this point in the history
  • Loading branch information
kilip committed Nov 27, 2018
2 parents e2b077c + c2dc958 commit 69e7485
Show file tree
Hide file tree
Showing 4 changed files with 43 additions and 16 deletions.
16 changes: 16 additions & 0 deletions .gitattributes
@@ -0,0 +1,16 @@
/.travis export-ignore
/build export-ignore
/features export-ignore
/node_modules export-ignore
/test export-ignore
/vendor export-ignore
.coveralls.yml export-ignore
.gitattributes export-ignore
.gitignore export-ignore
.travis.yml export-ignore
behat.yml.dist export-ignore
composer.lock export-ignore
Gruntfile.js export-ignore
package.json export-ignore
package-lock.json export-ignore
phpunit.xml.dist export-ignore
26 changes: 15 additions & 11 deletions .travis.yml
Expand Up @@ -19,12 +19,16 @@ env:

matrix:
fast_finish: true
allow_failures:
- php: 7.2
env: COVERAGE=yes
include:
- php: '5.6'
- php: '7.0'
- php: '7.1'
- php: '7.2'
- php: '7.2'
- php: 5.6
- php: 7.0
- php: 7.1
- php: 7.2
- php: 7.3
- php: 7.2
env: COVERAGE=yes

services:
Expand All @@ -33,14 +37,14 @@ services:
before_install:
- sudo apt-get update > /dev/null
- "mongo --eval 'db.runCommand({setParameter: 1, textSearchEnabled: true})' admin"
- if [[ $COVERAGE != yes ]]; then phpenv config-rm xdebug.ini; fi;
- if [[ $COVERAGE != yes ]]; then phpenv config-rm xdebug.ini || echo "xdebug not available"; fi;
- pecl channel-update pecl.php.net

install:
# install php packages required for running YAWIK phpunit tests
- pecl install -f ${PECLMONGO}
- php --ri mongodb || pecl install -f $PECLMONGO
# using solr master version in php 7.2
- 'if [[ ${TRAVIS_PHP_VERSION:0:3} == "7.2" ]]; then
- 'if [[ ${TRAVIS_PHP_VERSION:0:3} == "7.2" || ${TRAVIS_PHP_VERSION:0:3} == "7.3" ]]; then
export HASH=de1d724299780d927cb9ed14268449ac8a28204b;
curl --location https://github.com/php/pecl-search_engine-solr/archive/${HASH}.tar.gz -o solr.tgz;
sh -c "tar xfz solr.tgz";
Expand All @@ -51,7 +55,7 @@ install:
sh -c "cd $PECLSOLR && phpize && ./configure && make && sudo make install";
fi'
- phpenv config-add .travis/phpenv.ini
- COMPOSER_MEMORY_LIMIT=-1 composer install
- COMPOSER_MEMORY_LIMIT=-1 composer install --prefer-dist

before_script:
# behat preparation
Expand All @@ -65,12 +69,12 @@ before_script:
- chmod 777 build/behat

script:
- 'if [[ $COVERAGE = yes ]]; then
- 'if [[ $COVERAGE = yes ]]; then
./vendor/bin/phpunit --verbose --coverage-clover=build/logs/clover.xml --coverage-php=build/logs/clover.serialized;
else
./vendor/bin/phpunit --verbose;
./vendor/bin/behat;
fi'
- if [[ $COVERAGE != yes ]]; then ./vendor/bin/behat; fi;

after_failure:
- "./vendor/lakion/mink-debug-extension/travis/tools/upload-textfiles \"build/behat/*.log\""
Expand Down
15 changes: 11 additions & 4 deletions composer.json
Expand Up @@ -23,11 +23,19 @@
"prefer-stable": true,
"minimum-stability": "dev",
"require": {
"yawik/core": "^0.32@dev"
"yawik/core": "^0.32@dev",
"yawik/auth": "^0.32@dev",
"yawik/jobs": "^0.32@dev",
"yawik/settings": "^0.32@dev",
"yawik/applications": "^0.32@dev",
"yawik/cv": "^0.32@dev",
"yawik/geo": "^0.32@dev",
"yawik/organizations": "^0.32@dev",
"yawik/composer-plugin": "^0.32@dev"
},
"require-dev": {
"phpunit/phpunit": "^5.7",
"yawik/behat": "~0.32@dev",
"yawik/behat": "^0.32@dev",
"yawik/solr": "^0.32@dev"
},
"autoload": {
Expand All @@ -48,7 +56,6 @@
},
"scripts": {
"auto-scripts": [
"./vendor/bin/yawik assets-install --relative",
"npm install"
],
"post-install-cmd": [
Expand All @@ -57,7 +64,7 @@
"post-update-cmd": [
"@auto-scripts"
],
"serve": "APPLICATION_ENV=development php -S localhost:8000 -t test/sandbox/public",
"serve": "php -S localhost:8000 -t test/sandbox/public",
"start-selenium": "./vendor/bin/selenium-server-standalone -p 4444 -Dwebdriver.chrome.driver=./vendor/bin/chromedriver",
"test": "phpunit"
},
Expand Down
2 changes: 1 addition & 1 deletion test/sandbox/config/config.php
Expand Up @@ -9,9 +9,9 @@
'Auth',
'Jobs',
'Applications',
'Organizations',
'Geo',
'Settings',
'Organizations',
'JobsByMail'
],
];

0 comments on commit 69e7485

Please sign in to comment.