Merge pull request #349 from spira/hotfix/composer-discard-changes

Updated composer to always prefer-dist and discard any changes
spira · Jan 8, 2016 · 55b6e05 · 55b6e05
2 parents af30368 + a733220
commit 55b6e05
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -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:

diff --git a/api/composer.json b/api/composer.json
@@ -56,7 +56,8 @@
         ]
     },
     "config": {
-        "preferred-install": "dist"
+        "preferred-install": "dist",
+        "discard-changes": true
     },
     "scripts": {
         "post-install-cmd": [

diff --git a/composer.json b/composer.json
@@ -9,6 +9,7 @@
         "satooshi/php-coveralls": "dev-master"
     },
 	"config": {
-		"preferred-install": "dist"
+                "preferred-install": "dist",
+                "discard-changes": true
 	}
 }
diff --git a/forum/composer.json b/forum/composer.json
@@ -37,7 +37,8 @@
     ],
     "minimum-stability": "dev",
     "config": {
-        "preferred-install": "dist"
+        "preferred-install": "dist",
+        "discard-changes": true
     },
     "autoload": {
         "psr-0": {