Skip to content

Commit 6f6ec7b

Browse files
authored
Splits CI Jobs Into Unit And Integration Tests On Linux (#169)
* split testing job into unit and integration test jobs * execute workflow on push for now. Will be remove before opening the PR * use correct name for nightly swift versions * use correct format for specifying docker image * remove amazonlinux2 * only run on pull_request
1 parent 1d37934 commit 6f6ec7b

File tree

1 file changed

+32
-8
lines changed

1 file changed

+32
-8
lines changed

.github/workflows/test.yml

Lines changed: 32 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ jobs:
1313
swiftver:
1414
- 5.2
1515
- 5.3
16+
- 5.4
1617
dbimage:
1718
- postgres:13
1819
- postgres:12
@@ -55,9 +56,35 @@ jobs:
5556
POSTGRES_HOSTNAME: psql-a
5657
POSTGRES_HOSTNAME_A: psql-a
5758
POSTGRES_HOSTNAME_B: psql-b
59+
60+
# Run unit tests on Linux Swift runners on
61+
linux-unit-tests:
62+
strategy:
63+
fail-fast: false
64+
matrix:
65+
swiftver:
66+
- swift:5.2
67+
- swift:5.3
68+
- swift:5.4
69+
- swiftlang/swift:nightly-5.5
70+
- swiftlang/swift:nightly-main
71+
swiftos:
72+
#- xenial
73+
#- bionic
74+
- focal
75+
#- centos7
76+
#- centos8
77+
#- amazonlinux2
78+
container: ${{ format('{0}-{1}', matrix.swiftver, matrix.swiftos) }}
79+
runs-on: ubuntu-latest
80+
steps:
81+
- name: Check out code
82+
uses: actions/checkout@v2
83+
- name: Run tests with Thread Sanitizer
84+
run: swift test --enable-test-discovery --sanitize=thread --filter=^PostgresNIOTests
5885

59-
# Run package tests on Linux Swift runners against supported PSQL versions
60-
linux:
86+
# Run integration tests on Linux Swift runners against supported PSQL versions
87+
linux-integration-tests:
6188
strategy:
6289
fail-fast: false
6390
matrix:
@@ -70,17 +97,14 @@ jobs:
7097
- md5
7198
- scram-sha-256
7299
swiftver:
73-
- swift:5.2
74-
- swift:5.3
75-
#- swiftlang/swift:nightly-5.3
76-
#- swiftlang/swift:nightly-master
100+
- swift:5.4
77101
swiftos:
78102
#- xenial
79103
#- bionic
80104
- focal
81105
#- centos7
82106
#- centos8
83-
- amazonlinux2
107+
#- amazonlinux2
84108
container: ${{ format('{0}-{1}', matrix.swiftver, matrix.swiftos) }}
85109
runs-on: ubuntu-latest
86110
services:
@@ -96,7 +120,7 @@ jobs:
96120
- name: Check out code
97121
uses: actions/checkout@v2
98122
- name: Run tests with Thread Sanitizer
99-
run: swift test --enable-test-discovery --sanitize=thread
123+
run: swift test --enable-test-discovery --sanitize=thread --filter=^IntegrationTests
100124
env:
101125
POSTGRES_HOSTNAME: psql
102126
POSTGRES_USER: vapor_username

0 commit comments

Comments
 (0)