Update CI (#104)

Author: novi

.circleci/config.yml

@@ -1,70 +1,55 @@
 version: 2
+
+
 jobs:
-  mac-swift4.2:
+  mac-swift5.1:
     macos:
-      xcode: "10.0.0"
+      xcode: "11.3.0"
     steps:
       - checkout
-      - run: brew update
-      - run: brew install https://gist.github.com/novi/dd21d48d260379e8919d9490bf5cfaec/raw/6ea4daa02d93f4ab0110ad30d87ea2b497a71cd0/cmysqlmariadb.rb #cmysql
+      - run: brew update && brew tap novi/tap && brew install novi/tap/cmysqlmariadb
       - run: mkdir -p /usr/local/etc/my.cnf.d #workaround
       - run: sh -c "mysqld_safe --skip-grant-tables & sleep 5"
       - run: mysql -u root -e "create database IF NOT EXISTS test;"
       - run: swift build
       - run: swift test
-  mac-swift5.0:
+  mac-swift5.2:
     macos:
-      xcode: "10.2.0"
+      xcode: "11.5.0"
     steps:
       - checkout
-      - run: brew update
-      - run: brew install https://gist.github.com/novi/dd21d48d260379e8919d9490bf5cfaec/raw/6ea4daa02d93f4ab0110ad30d87ea2b497a71cd0/cmysqlmariadb.rb #cmysql
+      - run: brew update && brew tap novi/tap && brew install novi/tap/cmysqlmariadb
       - run: mkdir -p /usr/local/etc/my.cnf.d #workaround
       - run: sh -c "mysqld_safe --skip-grant-tables & sleep 5"
       - run: mysql -u root -e "create database IF NOT EXISTS test;"
       - run: swift build
       - run: swift test
-  mac-swift5.1:
+  mac-swift5.1-mysql:
     macos:
-      xcode: "11.0.0"
+      xcode: "11.3.0"
     steps:
       - checkout
       - run: brew update
-      - run: brew install https://gist.github.com/novi/dd21d48d260379e8919d9490bf5cfaec/raw/6ea4daa02d93f4ab0110ad30d87ea2b497a71cd0/cmysqlmariadb.rb #cmysql
-      - run: mkdir -p /usr/local/etc/my.cnf.d #workaround
-      - run: sh -c "mysqld_safe --skip-grant-tables & sleep 5"
+      - run: brew update && brew tap novi/tap && brew install novi/tap/cmysql
+      - run: mysql.server start
       - run: mysql -u root -e "create database IF NOT EXISTS test;"
       - run: swift build
       - run: swift test
-  mac-swift5.0-mysql:
+  mac-swift5.2-mysql:
     macos:
-      xcode: "10.2.0"
+      xcode: "11.5.0"
     steps:
       - checkout
       - run: brew update
-      - run: brew install https://gist.githubusercontent.com/novi/c6d4afa6e9f9cc9c426e3ccd140c3c74/raw/7130ad1d5062cdb2f7492d42e8d5574b864f3e18/cmysql.rb
+      - run: brew update && brew tap novi/tap && brew install novi/tap/cmysql
       - run: mysql.server start
       - run: mysql -u root -e "create database IF NOT EXISTS test;"
       - run: swift build
       - run: swift test
-  linux-swift4.1:
-    docker:
-      - image: yusukeito/swift-basic:swift4.1
-      - image: circleci/mariadb:10.3
-        environment:
-          MYSQL_USER: root
-          MYSQL_DATABASE: "test"
-          MYSQL_ALLOW_EMPTY_PASSWORD: yes
-          MYSQL_ROOT_HOST: "%"
-          DATABASE_HOST: "%"
-    steps:
-      - checkout
-      - run: sleep 5 #wait for mysql
-      - run: swift build
-      - run: swift test
-  linux-swift4.2:
+
+  linux-swift5.0:
     docker:
-      - image: yusukeito/swift-basic:swift4.2
+      - image: yusukeito/swift-basic:swift5.0
       - image: mariadb:10.3
         environment:
           MYSQL_USER: root
@@ -74,12 +59,13 @@ jobs:
           DATABASE_HOST: "%"
     steps:
       - checkout
-      - run: sleep 5 #wait for mysql
+      - run: sleep 10 #wait for mysql
       - run: swift build
       - run: swift test
-  linux-swift5.0:
+
+  linux-swift5.1:
     docker:
-      - image: yusukeito/swift-basic:swift5.0
+      - image: yusukeito/swift-basic:swift5.1-cgrpc
       - image: mariadb:10.3
         environment:
           MYSQL_USER: root
@@ -89,12 +75,13 @@ jobs:
           DATABASE_HOST: "%"
     steps:
       - checkout
-      - run: sleep 5 #wait for mysql
+      - run: sleep 10 #wait for mysql
       - run: swift build
       - run: swift test
-  linux-swift5.1:
+
+  linux-swift5.2:
     docker:
-      - image: yusukeito/swift-basic:swift5.1
+      - image: yusukeito/swift-basic:swift5.2-grpc-1
       - image: mariadb:10.3
         environment:
           MYSQL_USER: root
@@ -104,19 +91,18 @@ jobs:
           DATABASE_HOST: "%"
     steps:
       - checkout
-      - run: sleep 5 #wait for mysql
+      - run: sleep 10 #wait for mysql
       - run: swift build
       - run: swift test
 
 workflows:
   version: 2
   build_and_test:
     jobs:
-      - mac-swift4.2
-      - mac-swift5.0
-      - mac-swift5.0-mysql
       - mac-swift5.1
-      - linux-swift4.1
-      - linux-swift4.2
+      - mac-swift5.1-mysql
+      - mac-swift5.2
+      - mac-swift5.2-mysql
       - linux-swift5.0
-      - linux-swift5.1
+      - linux-swift5.1
+      - linux-swift5.2

.gitignore

@@ -31,3 +31,4 @@ Carthage/
 
 Constants.swift
 /*.xcodeproj
+.swiftpm/