From c597efa9c36bb2f6f09c81792679a14f0c46a4a0 Mon Sep 17 00:00:00 2001
From: tanner0101 <me@tanner.xyz>
Date: Thu, 24 Oct 2019 18:06:40 -0400
Subject: [PATCH 1/2] beta 1

---
 Package.swift | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Package.swift b/Package.swift
index 6e1e190b..c461f601 100644
--- a/Package.swift
+++ b/Package.swift
@@ -10,8 +10,8 @@ let package = Package(
         .library(name: "Fluent", targets: ["Fluent"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/vapor/fluent-kit.git", .branch("master")),
-        .package(url: "https://github.com/vapor/vapor.git", .branch("master")),
+        .package(url: "https://github.com/vapor/fluent-kit.git", from: "1.0.0-beta"),
+        .package(url: "https://github.com/vapor/vapor.git", from: "4.0.0-beta"),
     ],
     targets: [
         .target(name: "Fluent", dependencies: ["FluentKit", "Vapor"]),

From 226873dfd2fddf1cfa4f881d7b6cb7fa4699b977 Mon Sep 17 00:00:00 2001
From: tanner0101 <me@tanner.xyz>
Date: Thu, 24 Oct 2019 18:08:49 -0400
Subject: [PATCH 2/2] use gh actions for ci

---
 .github/FUNDING.yml        |  2 ++
 .github/workflows/test.yml | 25 +++++++++++++++++++++++
 circle.yml                 | 42 --------------------------------------
 3 files changed, 27 insertions(+), 42 deletions(-)
 create mode 100644 .github/FUNDING.yml
 create mode 100644 .github/workflows/test.yml
 delete mode 100644 circle.yml

diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
new file mode 100644
index 00000000..0a22eec5
--- /dev/null
+++ b/.github/FUNDING.yml
@@ -0,0 +1,2 @@
+github: [tanner0101] # loganwright, joscdk
+open_collective: vapor
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
new file mode 100644
index 00000000..4c0d091b
--- /dev/null
+++ b/.github/workflows/test.yml
@@ -0,0 +1,25 @@
+name: test
+on:
+- pull_request
+jobs:
+  xenial:
+    container: 
+      image: vapor/swift:5.1-xenial
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@master
+    - run: swift test
+  bionic:
+    container: 
+      image: vapor/swift:5.1-bionic
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@master
+    - run: swift test
+  thread:
+    container: 
+      image: vapor/swift:5.1-bionic
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@master
+    - run: swift test --sanitize=thread
diff --git a/circle.yml b/circle.yml
deleted file mode 100644
index f35d7ac3..00000000
--- a/circle.yml
+++ /dev/null
@@ -1,42 +0,0 @@
-version: 2
-
-jobs:
-  macos:
-    macos:
-      xcode: "11.0.0"
-    steps:
-      - checkout
-      - run: HOMEBREW_NO_AUTO_UPDATE=1 brew install openssl@1.1
-      - run: swift build
-      - run: swift test
-  macos-release:
-    macos:
-      xcode: "11.0.0"
-    steps:
-      - checkout
-      - run: HOMEBREW_NO_AUTO_UPDATE=1 brew install openssl@1.1
-      - run: swift build -c release
-  bionic:
-    docker:
-      - image: vapor/swift:5.1-bionic
-    steps:
-      - checkout
-      - run: apt-get update; apt-get install -y libssl-dev zlib1g-dev
-      - run: swift build
-      - run: swift test
-  bionic-release:
-    docker:
-      - image: vapor/swift:5.1-bionic
-    steps:
-      - checkout
-      - run: apt-get update; apt-get install -y libssl-dev zlib1g-dev
-      - run: swift build -c release
-
-workflows:
-  version: 2
-  tests:
-    jobs:
-#      - macos
-#      - macos-release
-      - bionic
-      - bionic-release