Merge pull request #64 from vapor-community/circleci-2.0

circleci 2.0 + multi swift tests
vapor-community · Oct 5, 2017 · 3c24375 · 3c24375
2 parents c071ff5 + d6cb775
commit 3c24375
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 15 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -0,0 +1,41 @@
+version: 2
+
+jobs:
+  swift-3:
+    docker:
+      - image: swift:3.1
+      - image: circleci/postgres:latest
+        environment:
+          POSTGRES_USER: postgres
+          POSTGRES_DB: postgres
+          POSTGRES_PASSWORD: ""
+    steps:
+      - run: eval "$(curl -sL https://apt.vapor.sh)"
+      - run: apt-get install -yq libpq-dev ctls
+      - checkout
+      - run: swift build
+      - run: swift build -c release
+      - run: swift test
+
+  swift-4:
+    docker:
+      - image: swift:4.0
+      - image: circleci/postgres:latest
+        environment:
+          POSTGRES_USER: postgres
+          POSTGRES_DB: postgres
+          POSTGRES_PASSWORD: ""
+    steps:
+      - run: eval "$(curl -sL https://apt.vapor.sh)"
+      - run: apt-get install -yq libpq-dev ctls
+      - checkout
+      - run: swift build
+      - run: swift build -c release
+      - run: swift test
+
+workflows:
+  version: 2
+  tests:
+    jobs:
+      - swift-3
+      - swift-4
diff --git a/Tests/PostgreSQLTests/Utilities.swift b/Tests/PostgreSQLTests/Utilities.swift
@@ -8,7 +8,7 @@ extension PostgreSQL.Database {
             let postgreSQL = try PostgreSQL.Database(
                 hostname: "127.0.0.1",
                 port: 5432,
-                database: "test",
+                database: "postgres",
                 user: "postgres",
                 password: ""
             )

diff --git a/circle.yml b/circle.yml