Skip to content

Commit cf09800

Browse files
authored
Update CI in preparation for bumping to 5.6 min version (vapor#337)
Update CI in preparation for bumping to 5.6 min version.
1 parent 4097b2f commit cf09800

File tree

1 file changed

+15
-12
lines changed

1 file changed

+15
-12
lines changed

.github/workflows/test.yml

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
name: CI
2+
concurrency:
3+
group: ${{ github.workflow }}-${{ github.ref }}
4+
cancel-in-progress: true
25
on:
36
push:
47
branches:
@@ -13,9 +16,10 @@ jobs:
1316
fail-fast: false
1417
matrix:
1518
container:
16-
- swift:5.5-bionic
1719
- swift:5.6-focal
1820
- swift:5.7-jammy
21+
- swift:5.8-jammy
22+
- swiftlang/swift:nightly-5.9-jammy
1923
- swiftlang/swift:nightly-main-jammy
2024
container: ${{ matrix.container }}
2125
runs-on: ubuntu-latest
@@ -27,7 +31,7 @@ jobs:
2731
- name: Run unit tests with code coverage and Thread Sanitizer
2832
run: swift test --enable-test-discovery --filter=^PostgresNIOTests --sanitize=thread --enable-code-coverage
2933
- name: Submit coverage report to Codecov.io
30-
if: "!contains(matrix.container, 'nightly')"
34+
if: ${{ !contains(matrix.container, '5.8') }}
3135
uses: vapor/swift-codecov-action@v0.2
3236
with:
3337
cc_flags: 'unittests'
@@ -52,7 +56,8 @@ jobs:
5256
dbauth: md5
5357
- dbimage: postgres:11
5458
dbauth: trust
55-
container: swift:5.7-jammy
59+
container:
60+
image: swift:5.8-jammy
5661
runs-on: ubuntu-latest
5762
env:
5863
LOG_LEVEL: debug
@@ -114,14 +119,13 @@ jobs:
114119
fail-fast: false
115120
matrix:
116121
dbimage:
117-
# Only test the lastest version on macOS, let Linux do the rest
122+
# Only test one version on macOS, let Linux do the rest
118123
- postgresql@14
119124
dbauth:
120125
# Only test one auth method on macOS, Linux tests will cover the others
121126
- scram-sha-256
122127
xcode:
123128
- latest-stable
124-
#- latest
125129
runs-on: macos-12
126130
env:
127131
LOG_LEVEL: debug
@@ -145,14 +149,12 @@ jobs:
145149
- name: Checkout code
146150
uses: actions/checkout@v3
147151
- name: Run all tests
148-
run: |
149-
swift test --enable-test-discovery -Xlinker -rpath \
150-
-Xlinker $(xcode-select -p)/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift-5.5/macosx
152+
run: swift test
151153

152154
api-breakage:
153155
if: github.event_name == 'pull_request'
154156
runs-on: ubuntu-latest
155-
container: swift:5.7-jammy
157+
container: swift:5.8-jammy
156158
steps:
157159
- name: Checkout
158160
uses: actions/checkout@v3
@@ -162,15 +164,16 @@ jobs:
162164
- name: Mark the workspace as safe
163165
run: git config --global --add safe.directory ${GITHUB_WORKSPACE}
164166
- name: API breaking changes
165-
run: |
166-
swift package diagnose-api-breaking-changes origin/main
167+
run: swift package diagnose-api-breaking-changes origin/main
168+
167169
test-exports:
168170
name: Test exports
169171
runs-on: ubuntu-latest
172+
container: swift:5.8-jammy
170173
steps:
171174
- name: Check out package
172175
uses: actions/checkout@v3
173176
with:
174177
fetch-depth: 0
175178
- name: Build
176-
run: swift build -Xswiftc -DBUILDING_DOCC
179+
run: swift build -Xswiftc -DBUILDING_DOCC

0 commit comments

Comments
 (0)