Skip to content

Commit

Permalink
Merge pull request #32 from yawik/develop
Browse files Browse the repository at this point in the history
Release 0.1.0
  • Loading branch information
cbleek authored Mar 18, 2019
2 parents 61d9885 + a742e66 commit bcc5a0b
Show file tree
Hide file tree
Showing 26 changed files with 230 additions and 8,488 deletions.
2 changes: 1 addition & 1 deletion .coveralls.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
service_name: travis-ci
json_path: ./json
coverage_clover: test/build/logs/clover.xml
coverage_clover: build/logs/clover.xml
16 changes: 16 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -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
6 changes: 5 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
*~
phpunit.xml
vendor
behat.yml
behat.yml
composer.lock
node_modules/
var/
package-lock.json
19 changes: 11 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,14 @@ 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: 7.1
- php: 7.2
- php: 7.3
- php: 7.2
env: COVERAGE=yes

services:
Expand All @@ -32,14 +34,15 @@ 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}
- phpenv config-add .travis/phpenv.ini
- composer install
# TODO: change to --prefer-dist when CoreTestUtils become separate packages
- COMPOSER_MEMORY_LIMIT=-1 composer install --prefer-source

before_script:
# behat preparation
Expand Down Expand Up @@ -67,7 +70,7 @@ after_failure:

after_script:
- 'if [[ $COVERAGE = yes ]]; then
composer require php-coveralls/php-coveralls;
composer require php-coveralls/php-coveralls --no-scripts;
travis_retry ./vendor/bin/php-coveralls -vvv;
wget https://scrutinizer-ci.com/ocular.phar;
travis_retry php ocular.phar code-coverage:upload --format=php-clover build/logs/clover.serialized;
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ This module provides import tasks

Build status:

[![Build Status](https://api.travis-ci.org/yawik/SimpleImport.svg)](https://travis-ci.org/yawik/SimpleImport)
[![Build Status](https://api.travis-ci.org/yawik/SimpleImport.svg?branch=master)](https://travis-ci.org/yawik/SimpleImport)
[![Coverage Status](https://coveralls.io/repos/github/yawik/SimpleImport/badge.svg?branch=master)](https://coveralls.io/github/yawik/SimpleImport?branch=master)

Requirements
Expand Down
5 changes: 2 additions & 3 deletions behat.yml.dist
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ default:
paths: false
extensions:
Lakion\Behat\MinkDebugExtension:
directory: build/behat
directory: "%paths.base%/build/behat"
clean_start: true
screenshot: true

Expand Down Expand Up @@ -40,7 +40,6 @@ default:
user:
contexts:
- Behat\MinkExtension\Context\MinkContext
- Yawik\Behat\CoreContext:
config: "test/config/config.php"
- Yawik\Behat\CoreContext
- Yawik\Behat\UserContext
- Yawik\Behat\SummaryFormContext
3 changes: 3 additions & 0 deletions build/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
behat/*
!behat/.gitkeep
logs
Empty file added build/behat/.gitkeep
Empty file.
29 changes: 25 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,22 @@
"config": {
"platform": {
"ext-mongo": "1.6.16"
}
},
"process-timeout": 0
},
"prefer-stable": true,
"minimum-stability": "dev",
"require": {
"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/organizations": "^0.32@dev",
"yawik/composer-plugin": "^0.32@dev",
"yawik/core": "^0.32@dev",
"yawik/geo": "^0.32@dev",
"willdurand/geocoder": "^3.3.2"
},
"require-dev": {
"phpunit/phpunit": "^5.7",
Expand All @@ -42,13 +52,24 @@
"psr-4": { "SimpleImport\\": "src/"}
},
"autoload-dev": {
"psr-4": {
"SimpleImportTest\\": "test/SimpleImportTest/",
"CoreTestUtils\\": "vendor/yawik/core/test/CoreTestUtils/"
},
"psr-0": {
"": "test/"
}
},
"extra": {
"branch-alias": {
"dev-develop": "0.32-dev"
},
"zf": {
"module": "SimpleImport"
}
},
"scripts": {
"auto-scripts": [
"./vendor/bin/yawik assets:install --relative",
"npm install"
],
"post-install-cmd": [
Expand All @@ -57,7 +78,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
Loading

0 comments on commit bcc5a0b

Please sign in to comment.