Skip to content

Commit 3bf4f6e

Browse files
authored
Release Candidate 1 (#85)
* rc.1 * readme + 5.2 * readme * br * 64
1 parent 18fec1c commit 3bf4f6e

File tree

6 files changed

+44
-369
lines changed

6 files changed

+44
-369
lines changed

.github/workflows/test.yml

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ name: test
22
on:
33
- pull_request
44
jobs:
5-
xenial:
5+
postgres-nio:
66
container:
7-
image: vapor/swift:5.1-xenial
7+
image: vapor/swift:5.2
88
services:
99
psql:
1010
image: postgres
@@ -18,9 +18,9 @@ jobs:
1818
steps:
1919
- uses: actions/checkout@v1
2020
- run: swift test --enable-test-discovery --sanitize=thread
21-
bionic:
21+
postgres-kit:
2222
container:
23-
image: vapor/swift:5.1-bionic
23+
image: vapor/swift:5.2
2424
services:
2525
psql:
2626
image: postgres
@@ -32,9 +32,15 @@ jobs:
3232
POSTGRES_PASSWORD: vapor_password
3333
runs-on: ubuntu-latest
3434
steps:
35-
- uses: actions/checkout@v1
35+
- run: git clone -b master https://github.com/vapor/postgres-kit.git
36+
working-directory: ./
37+
- run: swift package edit postgres-nio --revision ${{ github.sha }}
38+
working-directory: ./postgres-kit
3639
- run: swift test --enable-test-discovery --sanitize=thread
37-
fluent:
40+
working-directory: ./postgres-kit
41+
env:
42+
POSTGRES_HOSTNAME: psql
43+
fluent-postgres-driver:
3844
container:
3945
image: vapor/swift:5.2
4046
services:

Package.swift

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,32 @@
1-
// swift-tools-version:5.1
1+
// swift-tools-version:5.2
22
import PackageDescription
33

44
let package = Package(
55
name: "postgres-nio",
66
platforms: [
7-
.macOS(.v10_14)
7+
.macOS(.v10_15)
88
],
99
products: [
1010
.library(name: "PostgresNIO", targets: ["PostgresNIO"]),
1111
],
1212
dependencies: [
13+
.package(url: "https://github.com/apple/swift-crypto.git", from: "1.0.0"),
1314
.package(url: "https://github.com/apple/swift-nio.git", from: "2.0.0"),
1415
.package(url: "https://github.com/apple/swift-nio-ssl.git", from: "2.0.0"),
1516
.package(url: "https://github.com/apple/swift-metrics.git", from: "1.0.0"),
1617
.package(url: "https://github.com/apple/swift-log.git", from: "1.0.0"),
1718
],
1819
targets: [
19-
.target(name: "CMD5", dependencies: []),
2020
.target(name: "PostgresNIO", dependencies: [
21-
"CMD5", "Logging", "Metrics", "NIO", "NIOSSL"
21+
.product(name: "Crypto", package: "swift-crypto"),
22+
.product(name: "Logging", package: "swift-log"),
23+
.product(name: "Metrics", package: "swift-metrics"),
24+
.product(name: "NIO", package: "swift-nio"),
25+
.product(name: "NIOSSL", package: "swift-nio-ssl"),
2226
]),
2327
.testTarget(name: "PostgresNIOTests", dependencies: [
24-
"PostgresNIO", "NIOTestUtils"
28+
.target(name: "PostgresNIO"),
29+
.product(name: "NIOTestUtils", package: "swift-nio"),
2530
]),
2631
]
2732
)

README.md

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,22 @@
1-
<p align="center">
2-
<img src="https://user-images.githubusercontent.com/1342803/59061804-5548e280-8872-11e9-819f-14f19f16fcb6.png" alt="PostgresNIO">
3-
<br>
4-
<br>
5-
<a href="https://api.vapor.codes/postgres-nio/master/PostgresNIO/index.html">
6-
<img src="http://img.shields.io/badge/api-docs-2196f3.svg" alt="Documentation">
7-
</a>
8-
<a href="https://discord.gg/vapor">
9-
<img src="https://img.shields.io/discord/431917998102675485.svg" alt="Team Chat">
10-
</a>
11-
<a href="LICENSE">
12-
<img src="http://img.shields.io/badge/license-MIT-brightgreen.svg" alt="MIT License">
13-
</a>
14-
<a href="https://circleci.com/gh/vapor/postgres-nio">
15-
<img src="https://circleci.com/gh/vapor/postgres-nio.svg?style=shield" alt="Continuous Integration">
16-
</a>
17-
<a href="https://swift.org">
18-
<img src="http://img.shields.io/badge/swift-5-brightgreen.svg" alt="Swift 5">
19-
</a>
20-
</p>
1+
<img src="https://user-images.githubusercontent.com/1342803/59061804-5548e280-8872-11e9-819f-14f19f16fcb6.png" height="64" alt="PostgresNIO">
2+
<br>
3+
<a href="https://docs.vapor.codes/4.0/">
4+
<img src="http://img.shields.io/badge/read_the-docs-2196f3.svg" alt="Documentation">
5+
</a>
6+
<a href="https://discord.gg/vapor">
7+
<img src="https://img.shields.io/discord/431917998102675485.svg" alt="Team Chat">
8+
</a>
9+
<a href="LICENSE">
10+
<img src="http://img.shields.io/badge/license-MIT-brightgreen.svg" alt="MIT License">
11+
</a>
12+
<a href="https://circleci.com/gh/vapor/postgres-nio">
13+
<img src="https://circleci.com/gh/vapor/postgres-nio.svg?style=shield" alt="Continuous Integration">
14+
</a>
15+
<a href="https://swift.org">
16+
<img src="http://img.shields.io/badge/swift-5-brightgreen.svg" alt="Swift 5">
17+
</a>
18+
<br>
19+
<br>
2120

2221
🐘 Non-blocking, event-driven Swift client for PostgreSQL built on [SwiftNIO](https://github.com/apple/swift-nio).
2322

0 commit comments

Comments
 (0)