Travis: Support OSX testing against both mysql 5.6 and latest available mysql.

Author: Abscissa

.travis.yml

@@ -133,6 +133,7 @@ addons:
   mariadb: '10.1'
   apt:
     packages: [ libevent-dev ]
+env: DB=mariadb-10.1
 
 install: $DMD -ofci_setup ci_setup.d && ./ci_setup
 script: ./run_tests --mode=travis
@@ -278,47 +279,66 @@ matrix:
     - d: dmd-2.088.0
       os: osx
       osx_image: xcode11.2 # use OSX 10.14
+      env: DB=mysql-5.6
 
     - d: dmd-2.088.0
       os: osx
       osx_image: xcode11.2 # use OSX 10.14
+      env: DB=mysql-5.6
 
     - d: dmd-2.080.0
       os: osx
       osx_image: xcode9.4 # use OSX 10.13
+      env: DB=mysql-5.6
 
     - d: dmd-2.079.1
       os: osx
       osx_image: xcode9.4 # use OSX 10.13
+      env: DB=mysql-5.6
 
     - d: dmd-2.078.3
       os: osx
       osx_image: xcode9.4 # use OSX 10.13
+      env: DB=mysql-5.6
 
     - d: ldc-1.9.0
       os: osx
       osx_image: xcode9.4 # use OSX 10.13
+      env: DB=mysql-5.6
 
     - d: ldc-1.8.0
       os: osx
       osx_image: xcode9.4 # use OSX 10.13
+      env: DB=mysql-5.6
 
     - d: dmd-2.068.2
       env: NO_VIBE=true
       os: osx
       osx_image: xcode9.4 # use OSX 10.13
+      env: DB=mysql-5.6
 
     - d: ldc-0.17.0
       env: NO_VIBE=true
       os: osx
       osx_image: xcode9.4 # use OSX 10.13
+      env: DB=mysql-5.6
 
     # Test with all dub dependencies fully updated
     # (dub.selections.json is deliberately kept old)
     - d: dmd-2.088.0
       services:
         - mysql
       env: DUB_UPGRADE=true DB=mysql-default
+    - d: dmd-2.088.0
+      os: osx
+      osx_image: xcode11.2 # use OSX 10.14
+      env: DUB_UPGRADE=true DB=mysql-5.6
+
+    # Test with latest mysql server available in OSX brew
+    - d: dmd-2.088.0
+      os: osx
+      osx_image: xcode11.2 # use OSX 10.14
+      env: DB=mysql-latest
 
   allow_failures:
     # Doesn't appear to exist on travis: https://github.com/travis-ci/travis-ci/issues/8849
@@ -333,6 +353,10 @@ matrix:
       services:
         - mysql
       env: DUB_UPGRADE=true DB=mysql-default
+    - d: dmd-2.088.0 # All dub dependencies fully updated
+      os: osx
+      osx_image: xcode11.2 # use OSX 10.14
+      env: DUB_UPGRADE=true DB=mysql-5.6
 
     # Currently failing on travis:
     # https://github.com/mysql-d/mysql-native/issues/208
@@ -343,7 +367,11 @@ matrix:
           packages: [ libevent-dev ]
       env: DB=mariadb-10.4 USE_UNIT_THREADED=true
 
-    # These are currently failing because mysql-native does not yet
+    # Test with latest mysql server available in OSX brew
+    # Currently failing because mysql-native does not yet
     # support MySQL v8.0.4's new default authentication mechanism: caching_sha2_password
     # See issue #189: https://github.com/mysql-d/mysql-native/issues/189
-    #TODO: Add test for OSX brew's latest available mysql server
+    - d: dmd-2.088.0
+      os: osx
+      osx_image: xcode11.2 # use OSX 10.14
+      env: DB=mysql-latest

ci_setup.d

@@ -18,7 +18,7 @@ void copyIfExists(string from, string to)
 		copy(from, to);
 }
 
-void main()
+int main()
 {
 	auto haveRdmd = executeShell("rdmd --help").status == 0;
 	if(!haveRdmd)
@@ -32,10 +32,24 @@ void main()
 	auto mysqlPrefix = "";
     if(environment["TRAVIS_OS_NAME"] == "osx")
 	{
-		spawnShell("brew update").wait;
-		spawnShell("brew install libevent").wait;
-		spawnShell("brew install mysql@5.6 && brew services start mysql56").wait;
-		mysqlPrefix = "/usr/local/opt/mysql@5.6/bin/";
+        if(envGet("DB") == "mysql-5.6")
+        {
+            spawnShell("brew update").wait;
+            spawnShell("brew install libevent").wait; // Is libevent still needed on OSX?
+            spawnShell("brew install mysql@5.6 && brew services start mysql56").wait;
+            mysqlPrefix = "/usr/local/opt/mysql@5.6/bin/";
+        }
+        else if(envGet("DB") == "mysql-latest")
+        {
+            spawnShell("brew update").wait;
+            spawnShell("brew install libevent").wait; // Is libevent still needed on OSX?
+            spawnShell("brew install mysql && brew services start mysql").wait;
+        }
+        else
+        {
+            writeln("Envar 'DB' must be 'mysql-5.6' or 'mysql-latest', not '", envGet("DB"), "'");
+            return 1;
+        }
 	}
 
 	// If an alternate dub.selections.json was requested, use it.
@@ -74,4 +88,6 @@ void main()
 	spawnShell(mysqlPrefix~`mysql -u root -e 'SHOW VARIABLES LIKE "%version%";'`).wait;
 	spawnShell(mysqlPrefix~`mysql -u root -e 'CREATE DATABASE mysqln_testdb;'`).wait;
 	write("testConnectionStr.txt", "host=127.0.0.1;port=3306;user=root;pwd=;db=mysqln_testdb");
+	
+	return 0;
 }