GitHub #192: Fix Composer branch-alias constraint in Drush make-conve…

…rt command

Merging drush-ops/drush#2392.

.travis.yml

@@ -13,7 +13,7 @@ php:
   - 5.6
 env:
   - VERSION=HEAD
-  - Version 8.x-1.11
+  - VERSION=8.x-1.11
   - VERSION=8.x-1.10
   - VERSION=8.x-1.06
   - VERSION=8.x-1.05
@@ -26,10 +26,13 @@ env:
 addons:
   apt:
     packages:
-    # Trusty does not include MySQL by defualt.
+    # Trusty does not include MySQL by default.
     - mysql-server-5.6
     - mysql-client-core-5.6
     - mysql-client-5.6
+    # Dependencies for Chrome.
+    - libappindicator1
+    - fonts-liberation
 
 before_install:
   - phpenv config-rm xdebug.ini
@@ -39,6 +42,7 @@ before_install:
   - export DISPLAY=:99.0
   - sh -e /etc/init.d/xvfb start
   - sleep 3
+
   # Download Chrome Driver
   - LATEST_CHROMEDRIVER=$(wget -q -O - http://chromedriver.storage.googleapis.com/LATEST_RELEASE)
   - wget http://chromedriver.storage.googleapis.com/$LATEST_CHROMEDRIVER/chromedriver_linux64.zip
@@ -47,7 +51,12 @@ before_install:
   - mkdir -p $HOME/.composer/vendor/bin
   - mv -f chromedriver $HOME/.composer/vendor/bin/
   - rm chromedriver_linux64.zip
-  # Echo Chrome version
+
+  # Update Chrome.
+  - export CHROME_BIN=/usr/bin/google-chrome
+  - wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
+  - sudo dpkg -i google-chrome-stable_current_amd64.deb
+  - rm google-chrome-stable_current_amd64.deb
   - google-chrome --version
 
 install:

composer.json

@@ -83,7 +83,9 @@
                 "Adding composer.json support to make-convert command":
                 "https://github.com/drush-ops/drush/commit/ce82b946d49b09cd33da5ca84feb24a6c35f8f8e.patch",
                 "The batch table may not exist by the time _drush_backend_batch_process() is called in 8.x-1.x":
-                "https://github.com/drush-ops/drush/commit/c389aebb7d3e26ff0f544684d8b3ec3528107e55.diff"
+                "https://github.com/drush-ops/drush/commit/c389aebb7d3e26ff0f544684d8b3ec3528107e55.diff",
+                "Fix composer branch-alias constraint":
+                "https://github.com/drush-ops/drush/commit/83436c8ea505223a1868dce130d4ca1b4e558711.diff"
             },
             "drupal/metatag": {
                 "2786795 - DrupalConsole integration breaks Drush":