Merge pull request #734 from sodabrew/travis_trusty

Use the Travis Trusty image

Author: sodabrew

.travis.yml

@@ -1,4 +1,5 @@
 sudo: required
+dist: trusty
 language: ruby
 bundler_args: --without benchmarks development
 # Temporary workaround for broken Rubygems on Travis
@@ -9,38 +10,64 @@ before_install:
 addons:
   hosts:
     - mysql2gem.example.com
+  apt:
+    packages:
+    - mysql-server-5.5
+    - mysql-client-core-5.5
+    - mysql-client-5.5
 rvm:
   - 2.3.0
   - 2.2
   - 2.1
   - 2.0.0
   - 1.9.3
-  - 1.8.7
-  - ree
-  - rbx-2
   - ruby-head
 matrix:
   include:
+    - rvm: 1.8.7
+      dist: precise
+    - rvm: ree
+      dist: precise
+    - rvm: rbx-2
+      dist: precise
     - rvm: 2.0.0
       env: DB=mariadb55
       addons:
-         mariadb: 5.5
-         hosts:
-           - mysql2gem.example.com
+        mariadb: 5.5
+        hosts:
+          - mysql2gem.example.com
     - rvm: 2.0.0
       env: DB=mariadb10.0
       addons:
-         mariadb: 10.0
-         hosts:
-           - mysql2gem.example.com
+        mariadb: 10.0
+        hosts:
+          - mysql2gem.example.com
     - rvm: 2.0.0
       env: DB=mariadb10.1
       addons:
-         mariadb: 10.1
-         hosts:
-           - mysql2gem.example.com
+        mariadb: 10.1
+        hosts:
+          - mysql2gem.example.com
+    - rvm: 2.0.0
+      env: DB=mysql56
+      addons:
+        hosts:
+          - mysql2gem.example.com
+        apt:
+          packages:
+          - mysql-server-5.6
+          - mysql-client-core-5.6
+          - mysql-client-5.6
     - rvm: 2.0.0
       env: DB=mysql57
+      addons:
+        hosts:
+          - mysql2gem.example.com
+        apt:
+          packages:
+          - mysql-server-5.7
+          - mysql-client-core-5.7
+          - mysql-client-5.7
     - rvm: 2.0.0
       env: DB=mysql55
       os: osx

.travis_mysql57.sh

@@ -6,7 +6,7 @@ service mysql stop
 apt-get purge '^mysql*' 'libmysql*'
 apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0x8C718D3B5072E1F5
 
-add-apt-repository 'deb http://repo.mysql.com/apt/ubuntu/ precise mysql-5.7'
+add-apt-repository 'deb http://repo.mysql.com/apt/ubuntu/ trusty mysql-5.7'
 
 apt-get update
 apt-get -o Dpkg::Options::=--force-confdef -o Dpkg::Options::=--force-confnew -y install mysql-server libmysqlclient-dev

.travis_setup.sh

@@ -20,7 +20,8 @@ if ! [[ x$OSTYPE =~ ^xdarwin ]]; then
   sudo service mysql restart
 fi
 
-sudo mysql -e "CREATE USER '$USER'@'localhost'" || true
+sudo mysql -u root -e "CREATE USER '$USER'@'localhost'" || true
+sudo mysql -u root -e "GRANT ALL ON test.* TO '$USER'@'localhost'" || true
 
 # Print the MySQL version and create the test DB
 if [[ x$OSTYPE =~ ^xdarwin ]]; then