Skip to content

Commit 96f2ab8

Browse files
authored
Merge pull request #646 from vapor/tn-beta-1
beta 1
2 parents b397883 + 226873d commit 96f2ab8

File tree

4 files changed

+29
-44
lines changed

4 files changed

+29
-44
lines changed

.github/FUNDING.yml

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

.github/workflows/test.yml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
name: test
2+
on:
3+
- pull_request
4+
jobs:
5+
xenial:
6+
container:
7+
image: vapor/swift:5.1-xenial
8+
runs-on: ubuntu-latest
9+
steps:
10+
- uses: actions/checkout@master
11+
- run: swift test
12+
bionic:
13+
container:
14+
image: vapor/swift:5.1-bionic
15+
runs-on: ubuntu-latest
16+
steps:
17+
- uses: actions/checkout@master
18+
- run: swift test
19+
thread:
20+
container:
21+
image: vapor/swift:5.1-bionic
22+
runs-on: ubuntu-latest
23+
steps:
24+
- uses: actions/checkout@master
25+
- run: swift test --sanitize=thread

Package.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ let package = Package(
1010
.library(name: "Fluent", targets: ["Fluent"]),
1111
],
1212
dependencies: [
13-
.package(url: "https://github.com/vapor/fluent-kit.git", .branch("master")),
14-
.package(url: "https://github.com/vapor/vapor.git", .branch("master")),
13+
.package(url: "https://github.com/vapor/fluent-kit.git", from: "1.0.0-beta"),
14+
.package(url: "https://github.com/vapor/vapor.git", from: "4.0.0-beta"),
1515
],
1616
targets: [
1717
.target(name: "Fluent", dependencies: ["FluentKit", "Vapor"]),

circle.yml

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

0 commit comments

Comments
 (0)