Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit cf8ec53

Browse files
2.0.0 release (vapor#158)
* 2.0.0 release * ci updates * update github docs * move contributing * fix log level
1 parent 2e76609 commit cf8ec53

File tree

8 files changed

+63
-95
lines changed

8 files changed

+63
-95
lines changed

‎.github/CONTRIBUTING.md‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
# Contributing to Fluent's PostgreSQL Driver
2+
3+
👋 Welcome to the Vapor team!
4+
5+
## Docker
6+
7+
In order to build and test against Postgres, you will need a database running. The easiest way to do this is using Docker and the included `docker-compose.yml` file.
8+
9+
If you have Docker installed on your computer, all you will need to do is:
10+
11+
```sh
12+
docker-compose up
13+
```
14+
15+
This will start the two databases required for running this package's unit tests.
16+
17+
## Xcode
18+
19+
To open the project in Xcode:
20+
21+
- Clone the repo to your computer
22+
- Drag and drop the folder onto Xcode
23+
24+
To test within Xcode, press `CMD+U`.
25+
26+
## SPM
27+
28+
To develop using SPM, open the code in your favorite code editor. Use the following commands from within the project's root folder to build and test.
29+
30+
```sh
31+
swift build
32+
swift test
33+
```
34+
35+
## SemVer
36+
37+
Vapor follows [SemVer](https://semver.org). This means that any changes to the source code that can cause
38+
existing code to stop compiling _must_ wait until the next major version to be included.
39+
40+
Code that is only additive and will not break any existing code can be included in the next minor release.
41+
42+
----------
43+
44+
Join us on Discord if you have any questions: [vapor.team](http://vapor.team).
45+
46+
— Thanks! 🙌

‎.github/FUNDING.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
github: [tanner0101]# loganwright, joscdk
1+
github: [tanner0101]
22
open_collective: vapor

‎.github/workflows/test.yml‎

Lines changed: 11 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -30,39 +30,29 @@ jobs:
3030
- postgres:11
3131
- postgres:12
3232
- postgres:13
33-
include:
34-
- depscmd: 'apt-get -q update && apt-get -q install -y postgresql-client'
35-
- image: swiftlang/swift:nightly-master-centos8
36-
depscmd: 'dnf install -y postgresql'
37-
- image: swiftlang/swift:nightly-master-amazonlinux2
38-
depscmd: 'yum install -y postgresql'
3933
container: ${{ matrix.image }}
4034
services:
4135
postgres-a:
4236
image: ${{ matrix.dbimage }}
43-
env: { POSTGRES_USER: vapor_username, POSTGRES_PASSWORD: vapor_password, POSTGRES_DB: vapor_database }
37+
env:
38+
POSTGRES_USER: vapor_username
39+
POSTGRES_PASSWORD: vapor_password
40+
POSTGRES_DB: vapor_database
4441
postgres-b:
4542
image: ${{ matrix.dbimage }}
46-
env: { POSTGRES_USER: vapor_username, POSTGRES_PASSWORD: vapor_password, POSTGRES_DB: vapor_database }
43+
env:
44+
POSTGRES_USER: vapor_username
45+
POSTGRES_PASSWORD: vapor_password
46+
POSTGRES_DB: vapor_database
4747
env:
4848
POSTGRES_HOSTNAME_A: postgres-a
4949
POSTGRES_HOSTNAME_B: postgres-b
50-
PGUSER: vapor_username
51-
PGPASSWORD: vapor_password
50+
LOG_LEVEL: info
5251
steps:
53-
- name: Install dependencies
54-
run: ${{ matrix.depscmd }}
55-
- name: Compensate for AmazonLinux2's Postgres
56-
if: ${{ endsWith(matrix.image, 'amazonlinux2') }}
57-
run: printf '#!/bin/bash\nexec psql "$@" </dev/null\n' >/usr/bin/pg_isready && chmod 0755 /usr/bin/pg_isready
58-
- name: Wait for database servers to be ready
59-
run: until pg_isready -hpostgres-a -dvapor_database && pg_isready -hpostgres-b -dvapor_database; do sleep 1; done
60-
timeout-minutes: 2
6152
- name: Checkout code
6253
uses: actions/checkout@v2
6354
- name: Run tests with Thread Sanitizer
6455
run: swift test --enable-test-discovery --sanitize=thread
65-
6656
macOS:
6757
strategy:
6858
fail-fast: false
@@ -79,7 +69,8 @@ jobs:
7969
steps:
8070
- name: Select latest available Xcode
8171
uses: maxim-lobanov/setup-xcode@1.0
82-
with: { 'xcode-version': 'latest' }
72+
with:
73+
xcode-version: latest
8374
- name: Replace Postgres install and start server
8475
run: |
8576
brew uninstall --force postgresql php && rm -rf /usr/local/{etc,var}/{postgres,pg}*

‎CONTRIBUTING.md‎

Lines changed: 0 additions & 37 deletions
This file was deleted.

‎Package.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ let package = Package(
1010
.library(name: "FluentPostgresDriver", targets: ["FluentPostgresDriver"]),
1111
],
1212
dependencies: [
13-
.package(url: "https://github.com/vapor/fluent-kit.git", from: "1.0.0-rc.2.7"),
13+
.package(url: "https://github.com/vapor/fluent-kit.git", from: "1.0.0"),
1414
.package(url: "https://github.com/vapor/postgres-kit.git", from: "2.0.0"),
1515
],
1616
targets: [

‎contribute_boostrap.sh‎

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎docker-compose.yml‎

Lines changed: 4 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,19 @@
11
version: '3'
22

33
services:
4-
psql-11-a:
5-
image: postgres:11
4+
a:
5+
image: postgres
66
environment:
77
POSTGRES_USER: vapor_username
88
POSTGRES_DB: vapor_database
99
POSTGRES_PASSWORD: vapor_password
1010
ports:
1111
- 5432:5432
12-
psql-11-b:
13-
image: postgres:11
12+
b:
13+
image: postgres
1414
environment:
1515
POSTGRES_USER: vapor_username
1616
POSTGRES_DB: vapor_database
1717
POSTGRES_PASSWORD: vapor_password
1818
ports:
1919
- 5433:5432
20-
psql-10:
21-
image: postgres:10
22-
environment:
23-
POSTGRES_USER: vapor_username
24-
POSTGRES_DB: vapor_database
25-
POSTGRES_PASSWORD: vapor_password
26-
ports:
27-
- 5432:5432
28-
psql-9:
29-
image: postgres:9
30-
environment:
31-
POSTGRES_USER: vapor_username
32-
POSTGRES_DB: vapor_database
33-
POSTGRES_PASSWORD: vapor_password
34-
ports:
35-
- 5432:5432
36-

‎test.Dockerfile‎

Lines changed: 0 additions & 7 deletions
This file was deleted.

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /