hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-23 09:53:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into PHRAS-2079_Admin_personnalisation_section

Browse Source
This commit is contained in:
Nicolas Maillat
2019-05-16 15:50:57 +02:00
committed by GitHub
parent 339e1bc811 6352a0c351
commit 609d50a4d6
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.circleci/config.yml
View File

@@ -1,6 +1,10 @@
version: 2.1 version: 2.1
orbs: orbs:
aws-ecr: circleci/aws-ecr@4.0.1 aws-ecr: circleci/aws-ecr@4.0.1
executors:
docker_build:
machine:
docker_layer_caching: true
jobs: jobs:
build: build:
working_directory: ~/alchemy-fr/Phraseanet working_directory: ~/alchemy-fr/Phraseanet
@@ -109,8 +113,6 @@ workflows:
oldfashion: oldfashion:
jobs: jobs:
- build - build
newfashion: newfashion:
jobs: jobs:
- aws-ecr/build_and_push_image: - aws-ecr/build_and_push_image:

4
composer.json
View File

@@ -47,7 +47,7 @@
"php": ">=5.5.9", "php": ">=5.5.9",
"ext-intl": "*", "ext-intl": "*",
"alchemy-fr/tcpdf-clone": "~6.0", "alchemy-fr/tcpdf-clone": "~6.0",
"alchemy/embed-bundle": "^2.0.0", "alchemy/embed-bundle": "^2.0.2",
"alchemy/geonames-api-consumer": "~0.1.0", "alchemy/geonames-api-consumer": "~0.1.0",
"alchemy/mediavorus": "^0.4.4", "alchemy/mediavorus": "^0.4.4",
"alchemy/oauth2php": "1.1.0", "alchemy/oauth2php": "1.1.0",
@@ -123,7 +123,7 @@
"paragonie/random-lib": "^2.0" "paragonie/random-lib": "^2.0"
}, },
"require-dev": { "require-dev": {
"mikey179/vfsStream": "~1.5", "mikey179/vfsstream": "~1.5",
"phpunit/phpunit": "^4.8|^5.0" "phpunit/phpunit": "^4.8|^5.0"
}, },
"autoload": { "autoload": {