Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Updated composer to always prefer-dist and discard any changes #349

Merged
1 commit merged into from
Jan 8, 2016
Merged

Updated composer to always prefer-dist and discard any changes #349

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@ install:
- travis_retry gulp bower:install
- travis_retry composer self-update
- travis_retry composer install --no-interaction --working-dir forum
- travis_retry composer install --prefer-source --no-interaction --working-dir api
- travis_retry composer install --prefer-source --no-interaction
- travis_retry composer install --no-interaction --working-dir api
- travis_retry composer install --no-interaction
- travis_retry gem install mailcatcher

before_script:
Expand Down
3 changes: 2 additions & 1 deletion api/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,8 @@
]
},
"config": {
"preferred-install": "dist"
"preferred-install": "dist",
"discard-changes": true
},
"scripts": {
"post-install-cmd": [
Expand Down
3 changes: 2 additions & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
"satooshi/php-coveralls": "dev-master"
},
"config": {
"preferred-install": "dist"
"preferred-install": "dist",
"discard-changes": true
}
}
3 changes: 2 additions & 1 deletion forum/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@
],
"minimum-stability": "dev",
"config": {
"preferred-install": "dist"
"preferred-install": "dist",
"discard-changes": true
},
"autoload": {
"psr-0": {
Expand Down