File tree Expand file tree Collapse file tree 2 files changed +11
-32
lines changed Expand file tree Collapse file tree 2 files changed +11
-32
lines changed Original file line number Diff line number Diff line change 1
1
name : test
2
- on : { pull_request: {} }
2
+ on :
3
+ pull_request : { branches: ['*'] }
4
+ push : { branches: ['main'] }
3
5
4
6
jobs :
5
- getcidata :
6
- runs-on : ubuntu-latest
7
- outputs :
8
- environments : ${{ steps.output.outputs.environments }}
9
- steps :
10
- - id : output
11
- run : |
12
- envblob="$(curl -fsSL https://raw.githubusercontent.com/vapor/ci/main/pr-environments.json | jq -cMj '.')"
13
- echo "::set-output name=environments::${envblob}"
14
-
15
- test-fluent :
16
- needs : getcidata
17
- strategy :
18
- fail-fast : false
19
- matrix :
20
- env : ${{ fromJSON(needs.getcidata.outputs.environments) }}
21
- runs-on : ${{ matrix.env.os }}
22
- container : ${{ matrix.env.image }}
23
- steps :
24
- - name : Select toolchain
25
- uses :
maxim-lobanov/[email protected]
26
- with :
27
- xcode-version : ${{ matrix.env.toolchain }}
28
- if : ${{ matrix.env.toolchain != '' }}
29
- - name : Check out Vapor
30
- uses : actions/checkout@v2
31
- - name : Run tests with Thread Sanitizer
32
- timeout-minutes : 30
33
- run : swift test --enable-test-discovery --sanitize=thread
7
+ unit-tests :
8
+ uses : vapor/ci/.github/workflows/run-unit-tests.yml@reusable-workflows
9
+ with :
10
+ with_coverage : true
11
+ with_tsan : true
12
+ with_public_api_check : ${{ github.event_name == 'pull_request' }}
Original file line number Diff line number Diff line change 1
- // swift-tools-version:5.2
1
+ // swift-tools-version:5.5
2
2
import PackageDescription
3
3
4
4
let package = Package (
@@ -10,7 +10,7 @@ let package = Package(
10
10
. library( name: " Fluent " , targets: [ " Fluent " ] ) ,
11
11
] ,
12
12
dependencies: [
13
- . package ( url: " https://github.com/vapor/fluent-kit.git " , from: " 1.16 .0 " ) ,
13
+ . package ( url: " https://github.com/vapor/fluent-kit.git " , from: " 1.36 .0 " ) ,
14
14
. package ( url: " https://github.com/vapor/vapor.git " , from: " 4.50.0 " ) ,
15
15
] ,
16
16
targets: [
You can’t perform that action at this time.
0 commit comments