upgrade deps and CI

This commit is contained in:
Julien Fastré 2017-06-20 20:58:28 +02:00
parent 86c0622ef3
commit ca4ffb4d53
2 changed files with 17 additions and 19 deletions

View File

@ -18,17 +18,18 @@ stages:
- build-doc - build-doc
- deploy-doc - deploy-doc
test:php-5.6:
stage: test
image: chill/ci-image:php-5.6
<<: *test_definition
script: phpunit
test:php-7: test:php-7:
stage: test stage: test
image: chill/ci-image:php-7 image: chill/ci-image:php-7
<<: *test_definition <<: *test_definition
script: phpunit script: vendor/bin/phpunit
test:php-71:
stage: test
image: chill/ci-image:php-7.1
<<: *test_definition
script: vendor/bin/phpunit
deploy-packagist: deploy-packagist:
stage: deploy stage: deploy
image: chill/ci-image:php-7 image: chill/ci-image:php-7
@ -44,10 +45,11 @@ deploy-packagist:
api-doc-build: api-doc-build:
stage: build-doc stage: build-doc
environment: api-doc environment: api-doc
image: chill/ci-image:php-7 image: chill/ci-image:php-7.1
before_script: before_script:
- mkdir api-doc - mkdir api-doc
script: apigen generate --destination api-doc/$CI_BUILD_REF_NAME/$CI_PROJECT_NAME - composer require apigen/apigen
script: vendor/bin/apigen generate --destination api-doc/$CI_BUILD_REF_NAME/$CI_PROJECT_NAME
artifacts: artifacts:
paths: paths:
- "api-doc/" - "api-doc/"

View File

@ -25,13 +25,15 @@
"twig/extensions": "~1.0", "twig/extensions": "~1.0",
"symfony/assetic-bundle": "~2.3", "symfony/assetic-bundle": "~2.3",
"symfony/swiftmailer-bundle": "~2.3", "symfony/swiftmailer-bundle": "~2.3",
"sensio/distribution-bundle": "~3.0", "sensio/distribution-bundle": "~5.0",
"sensio/framework-extra-bundle": "~3.0", "sensio/framework-extra-bundle": "~3.0",
"champs-libres/composer-bundle-migration": "~1.0", "champs-libres/composer-bundle-migration": "~1.0",
"doctrine/doctrine-migrations-bundle": "~1.1", "doctrine/doctrine-migrations-bundle": "~1.1",
"doctrine/migrations": "~1.0@dev", "doctrine/migrations": "~1.0",
"symfony/monolog-bundle": "^2.7", "symfony/monolog-bundle": "^2.7",
"chill-project/main": "dev-master" "chill-project/main": "dev-master@dev",
"phpoffice/phpspreadsheet": "dev-develop#9e835676a6a2df9f7e445a28d4d89f6bd296a7c5@dev",
"phpunit/phpunit": "^6.2"
}, },
"require-dev": { "require-dev": {
"chill-project/person": "dev-master@dev", "chill-project/person": "dev-master@dev",
@ -40,20 +42,14 @@
}, },
"scripts": { "scripts": {
"post-install-cmd": [ "post-install-cmd": [
"ComposerBundleMigration\\Composer\\Migrations::synchronizeMigrations",
"Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap" "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap"
], ],
"post-update-cmd": [ "post-update-cmd": [
"ComposerBundleMigration\\Composer\\Migrations::synchronizeMigrations",
"Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap" "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap"
] ]
}, },
"scripts": {
"post-install-cmd": [
"ComposerBundleMigration\\Composer\\Migrations::synchronizeMigrations"
],
"post-update-cmd": [
"ComposerBundleMigration\\Composer\\Migrations::synchronizeMigrations"
]
},
"extra": { "extra": {
"symfony-app-dir": "Tests/Fixtures/App/app", "symfony-app-dir": "Tests/Fixtures/App/app",
"app-migrations-dir": "Tests/Fixtures/App/app/DoctrineMigrations" "app-migrations-dir": "Tests/Fixtures/App/app/DoctrineMigrations"