From 56a0acea7f87090e716a0a7e93a2f17619161f5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zsolt=20Va=CC=81radi?= <vzsg@users.noreply.github.com>
Date: Tue, 16 Jan 2018 17:52:21 +0100
Subject: [PATCH 1/4] Depend on cpostgresql directly from the community repo

---
 Package.swift | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Package.swift b/Package.swift
index 8ee2770..78dc56d 100644
--- a/Package.swift
+++ b/Package.swift
@@ -3,8 +3,8 @@ import PackageDescription
 let package = Package(
     name: "PostgreSQL",
     dependencies: [
-   		 .Package(url: "https://github.com/vapor/cpostgresql.git", majorVersion: 1),
-   		 .Package(url: "https://github.com/vapor/node.git", majorVersion: 1),
-   		 .Package(url: "https://github.com/vapor/core.git", majorVersion: 1),
+        .Package(url: "https://github.com/vapor-community/cpostgresql.git", majorVersion: 1),
+        .Package(url: "https://github.com/vapor/node.git", majorVersion: 1),
+        .Package(url: "https://github.com/vapor/core.git", majorVersion: 1),
     ]
 )

From a1bc65156352e64e13b6b9779765371c1c91cb6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zsolt=20Va=CC=81radi?= <vzsg@users.noreply.github.com>
Date: Tue, 16 Jan 2018 17:53:35 +0100
Subject: [PATCH 2/4] Add pins and resolved versions to .gitignore

---
 .gitignore | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 6f43a06..56e95c2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,4 +4,5 @@ Sources/main.swift
 Packages
 Database
 *.xcodeproj
-
+Package.pins
+Package.resolved

From 410c00f304b656a6763e53f5eada81282916e155 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zsolt=20Va=CC=81radi?= <vzsg@users.noreply.github.com>
Date: Tue, 16 Jan 2018 17:54:54 +0100
Subject: [PATCH 3/4] Update CircleCI configuration to 2.0

---
 .circleci/config.yml | 16 ++++++++++++++++
 circle.yml           |  8 --------
 2 files changed, 16 insertions(+), 8 deletions(-)
 create mode 100644 .circleci/config.yml
 delete mode 100644 circle.yml

diff --git a/.circleci/config.yml b/.circleci/config.yml
new file mode 100644
index 0000000..1476270
--- /dev/null
+++ b/.circleci/config.yml
@@ -0,0 +1,16 @@
+version: 2
+jobs:
+  build:
+    docker:
+      - image: swift:3.1.1
+      - image: circleci/postgres:latest
+        environment:
+          POSTGRES_USER: postgres
+          POSTGRES_DB: test
+          POSTGRES_PASSWORD: ""
+    steps:
+      - run: apt-get update -yq && apt-get install -yq libpq-dev
+      - checkout
+      - run: swift build
+      - run: swift build -c release
+      - run: swift test
diff --git a/circle.yml b/circle.yml
deleted file mode 100644
index c9b6510..0000000
--- a/circle.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-dependencies:
-  pre:
-    - sudo -u postgres createuser user_testing 
-    - createdb test
-
-test:
-  override:
-    - eval "$(curl -sL swift.vapor.sh/ci)"

From 3b3c3e94477a0b092f502ef9d246248d91d5741d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zsolt=20Va=CC=81radi?= <vzsg@users.noreply.github.com>
Date: Tue, 16 Jan 2018 18:03:21 +0100
Subject: [PATCH 4/4] Drop Travis CI

---
 .travis.yml | 20 --------------------
 1 file changed, 20 deletions(-)
 delete mode 100644 .travis.yml

diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 64d80cf..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-language: ruby
-matrix:
-  include:
-    - os: linux
-      dist: trusty
-      sudo: required
-      services:
-        - postgresql
-      addons:
-          postgresql: "9.5"
-    - os: osx
-      osx_image: xcode8
-install:
-    - "[ $TRAVIS_OS_NAME = osx ] && pg_ctl -D /usr/local/var/postgres start && sleep 3 || true"
-    - "[ $TRAVIS_OS_NAME = osx ] && createuser -s postgres || true"
-    - psql -U postgres -c 'CREATE DATABASE test;'
-
-script:
-  - eval "$(curl -sL swift.vapor.sh/ci)"
-  - eval "$(curl -sL swift.vapor.sh/codecov)"