Merge pull request #109 from vapor/ci

circle ci 2

Author: tanner0101

.circleci/config.yml

@@ -2,3 +2,5 @@
 Packages
 *.xcodeproj
 Package.pins
+Package.resolved
+

.gitignore

@@ -6,9 +6,9 @@ extension MySQL.Database {
         do {
             let mysql = try MySQL.Database(
                 hostname: "127.0.0.1",
-                user: "ubuntu",
+                user: "root",
                 password: "",
-                database: "circle_test"
+                database: "test"
             )
             let connection = try mysql.makeConnection()
             try connection.execute("SELECT @@version")
@@ -22,10 +22,10 @@ extension MySQL.Database {
             print("Error: \(error)")
             print()
             print("You must configure MySQL to run with the following configuration: ")
-            print("    user: 'ubuntu'")
+            print("    user: 'root'")
             print("    password: '' // (empty)")
             print("    host: '127.0.0.1'")
-            print("    database: 'circle_test'")
+            print("    database: 'test'")
             print()
 
             print()

Tests/MySQLTests/Utilities.swift

@@ -1,14 +1,49 @@
-machine:
-  services:
-    - mysql
-dependencies:
-  override:
-    - eval "$(curl -sL https://apt.vapor.sh)"
-    - sudo apt-get install vapor cmysql
-    - sudo chmod -R a+rx /usr/
-test:
-  override:
-    - swift build
-    - swift build -c release
-    - swift test
-    
+version: 2
+
+jobs:
+  macos:
+    macos:
+      xcode: "9.0"
+    steps:
+      - run: brew install vapor/tap/vapor vapor/tap/cmysql
+      - run: brew services start mysql
+      - checkout
+      - run: swift build
+      - run: swift test
+
+  linux:
+    docker:
+      - image: swift:4.0
+      - image: mysql:5.7
+        environment:
+          MYSQL_ALLOW_EMPTY_PASSWORD: true
+          MYSQL_DATABASE: test
+    steps:
+      - run: apt-get update
+      - run: apt-get install -y libmysqlclient-dev libssl-dev
+      - checkout
+      - run: swift build
+      - run: swift test
+
+  # 3.1 backward compat checks
+
+  linux-3:
+    docker:
+      - image: swift:3.1
+      - image: mysql:5.7
+        environment:
+          MYSQL_ALLOW_EMPTY_PASSWORD: true
+          MYSQL_DATABASE: test
+    steps:
+      - run: apt-get update
+      - run: apt-get install -y libmysqlclient-dev libssl-dev
+      - checkout
+      - run: swift build
+      - run: swift test
+
+workflows:
+  version: 2
+  tests:
+    jobs:
+      - linux
+      - linux-3