Release Candidate 1 (#98)

* rc.1 * new tests
vapor · Feb 28, 2020 · 948eae1 · 948eae1
1 parent ab38827
commit 948eae1
Show file tree

Hide file tree

Showing 3 changed files with 95 additions and 21 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -2,23 +2,23 @@ name: test
 on:
 - pull_request
 jobs:
-  xenial:
+  sql-kit_xenial:
     container: 
-      image: vapor/swift:5.1-xenial
+      image: vapor/swift:5.2-xenial
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v1
     - run: swift test --enable-test-discovery --sanitize=thread
-  bionic:
+  sql-kit_bionic:
     container: 
-      image: vapor/swift:5.1-bionic
+      image: vapor/swift:5.2-bionic
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v1
     - run: swift test --enable-test-discovery --sanitize=thread
-  sqlite:
+  sqlite-kit:
     container: 
-      image: vapor/swift:5.1
+      image: vapor/swift:5.2
     runs-on: ubuntu-latest
     steps:
     - run: apt update -y; apt install -y libsqlite3-dev
@@ -28,9 +28,9 @@ jobs:
       working-directory: ./sqlite-kit
     - run: swift test --enable-test-discovery --sanitize=thread
       working-directory: ./sqlite-kit
-  postgres:
+  postgres-kit:
     container: 
-      image: vapor/swift:5.1
+      image: vapor/swift:5.2
     services:
       psql:
         image: postgres
@@ -50,9 +50,9 @@ jobs:
       working-directory: ./postgres-kit
       env:
         POSTGRES_HOSTNAME: psql
-  mysql:
+  mysql-kit:
     container: 
-      image: vapor/swift:5.1
+      image: vapor/swift:5.2
     services:
       mysql:
         image: mysql:5.7
@@ -72,3 +72,69 @@ jobs:
       env:
         MYSQL_HOSTNAME: mysql
         MYSQL_TLS: true
+  fluent-kit:
+    container: 
+      image: vapor/swift:5.2
+    runs-on: ubuntu-latest
+    steps:
+    - run: git clone -b master https://github.com/vapor/fluent-kit.git
+      working-directory: ./
+    - run: swift package edit sql-kit --revision ${{ github.sha }}
+      working-directory: ./fluent-kit
+    - run: swift test --enable-test-discovery --sanitize=thread
+      working-directory: ./fluent-kit
+  fluent-sqlite-driver:
+    container: 
+      image: vapor/swift:5.2
+    runs-on: ubuntu-latest
+    steps:
+    - run: apt update -y; apt install -y libsqlite3-dev
+    - run: git clone -b master https://github.com/vapor/fluent-sqlite-driver.git
+      working-directory: ./
+    - run: swift package edit sql-kit --revision ${{ github.sha }}
+      working-directory: ./fluent-sqlite-driver
+    - run: swift test --enable-test-discovery --sanitize=thread
+      working-directory: ./fluent-sqlite-driver
+  fluent-postgres-driver:
+    container: 
+      image: vapor/swift:5.2
+    services:
+      psql:
+        image: postgres
+        ports:
+          - 5432:5432
+        env:
+          POSTGRES_USER: vapor_username
+          POSTGRES_DB: vapor_database
+          POSTGRES_PASSWORD: vapor_password
+    runs-on: ubuntu-latest
+    steps:
+    - run: git clone -b master https://github.com/vapor/fluent-postgres-driver.git
+      working-directory: ./
+    - run: swift package edit sql-kit --revision ${{ github.sha }}
+      working-directory: ./fluent-postgres-driver
+    - run: swift test --enable-test-discovery --sanitize=thread
+      working-directory: ./fluent-postgres-driver
+      env:
+        POSTGRES_HOSTNAME: psql
+  fluent-mysql-driver:
+    container: 
+      image: vapor/swift:5.2
+    services:
+      mysql:
+        image: mysql
+        env:
+          MYSQL_ALLOW_EMPTY_PASSWORD: true
+          MYSQL_DATABASE: vapor_database
+          MYSQL_USER: vapor_username
+          MYSQL_PASSWORD: vapor_password
+    runs-on: ubuntu-latest
+    steps:
+    - run: git clone -b master https://github.com/vapor/fluent-mysql-driver.git
+      working-directory: ./
+    - run: swift package edit sql-kit --revision ${{ github.sha }}
+      working-directory: ./fluent-mysql-driver
+    - run: swift test --enable-test-discovery --sanitize=thread
+      working-directory: ./fluent-mysql-driver
+      env:
+        MYSQL_HOSTNAME: mysql
diff --git a/Package.swift b/Package.swift
@@ -1,10 +1,10 @@
-// swift-tools-version:5.1
+// swift-tools-version:5.2
 import PackageDescription
 
 let package = Package(
     name: "sql-kit",
     platforms: [
-       .macOS(.v10_14)
+       .macOS(.v10_15)
     ],
     products: [
         .library(name: "SQLKit", targets: ["SQLKit"]),
@@ -15,8 +15,16 @@ let package = Package(
         .package(url: "https://github.com/apple/swift-log.git", from: "1.0.0"),
     ],
     targets: [
-        .target(name: "SQLKit", dependencies: ["Logging", "NIO"]),
-        .target(name: "SQLKitBenchmark", dependencies: ["SQLKit"]),
-        .testTarget(name: "SQLKitTests", dependencies: ["SQLKit", "SQLKitBenchmark"]),
+        .target(name: "SQLKit", dependencies: [
+            .product(name: "Logging", package: "swift-log"),
+            .product(name: "NIO", package: "swift-nio"),
+        ]),
+        .target(name: "SQLKitBenchmark", dependencies: [
+            .target(name: "SQLKit")
+        ]),
+        .testTarget(name: "SQLKitTests", dependencies: [
+            .target(name: "SQLKit"),
+            .target(name: "SQLKitBenchmark"),
+        ]),
     ]
 )
diff --git a/README.md b/README.md
@@ -1,20 +1,20 @@
 <p align="center">
-    <img src="https://user-images.githubusercontent.com/1342803/58835528-3523e400-8624-11e9-8128-4925c7c9cf08.png" alt="SQLKit">
+    <img src="https://user-images.githubusercontent.com/1342803/58835528-3523e400-8624-11e9-8128-4925c7c9cf08.png" height="64" alt="SQLKit">
     <br>
     <br>
-    <a href="https://api.vapor.codes/sql/master/SQLKit/index.html">
-        <img src="http://img.shields.io/badge/api-docs-2196f3.svg" alt="Documentation">
+    <a href="https://docs.vapor.codes/4.0/">
+        <img src="http://img.shields.io/badge/read_the-docs-2196f3.svg" alt="Documentation">
     </a>
     <a href="https://discord.gg/vapor">
         <img src="https://img.shields.io/discord/431917998102675485.svg" alt="Team Chat">
     </a>
     <a href="LICENSE">
         <img src="http://img.shields.io/badge/license-MIT-brightgreen.svg" alt="MIT License">
     </a>
-    <a href="https://circleci.com/gh/vapor/sql-kit">
-        <img src="https://circleci.com/gh/vapor/sql-kit.svg?style=shield" alt="Continuous Integration">
+    <a href="https://github.com/vapor/sql-kit/actions">
+        <img src="https://github.com/vapor/sql-kit/workflows/test/badge.svg" alt="Continuous Integration">
     </a>
     <a href="https://swift.org">
-        <img src="http://img.shields.io/badge/swift-5-brightgreen.svg" alt="Swift 5">
+        <img src="http://img.shields.io/badge/swift-5.2-brightgreen.svg" alt="Swift 5.2">
     </a>
 </p>