Skip to content

Commit c0376e0

Browse files
authored
Rejigger test matrix again (#197)
1 parent 549b17f commit c0376e0

File tree

1 file changed

+6
-12
lines changed

1 file changed

+6
-12
lines changed

.github/workflows/test.yml

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ jobs:
1010
matrix:
1111
swiftver:
1212
- swift:5.2
13+
- swift:5.3
14+
- swift:5.4
1315
- swift:5.5
1416
- swiftlang/swift:nightly-main
1517
swiftos:
@@ -18,7 +20,7 @@ jobs:
1820
runs-on: ubuntu-latest
1921
env:
2022
LOG_LEVEL: debug
21-
MATRIX_CONFIG: ${{ toJSON(matrix) }}
23+
MATRIX_CONFIG: ${{ format('{0}-{1}', matrix.swiftver, matrix.swiftos) }}
2224
steps:
2325
- name: Check out package
2426
uses: actions/checkout@v2
@@ -31,10 +33,8 @@ jobs:
3133
exc_prefix="$(which xcrun || true)" && \
3234
${exc_prefix} llvm-cov export -format lcov \
3335
-instr-profile="$(dirname "$(swift test --show-codecov-path)")/default.profdata" \
34-
--ignore-filename-regex='/\.build/' \
35-
--ignore-filename-regex='/Tests/' \
36-
"$(swift build --show-bin-path)/${pkgname}PackageTests.xctest${subpath}" \
37-
>"${pkgname}.lcov"
36+
--ignore-filename-regex='/\.build/' --ignore-filename-regex='/Tests/' \
37+
"$(swift build --show-bin-path)/${pkgname}PackageTests.xctest${subpath}" >"${pkgname}.lcov"
3838
echo "CODECOV_FILE=$(pwd)/${pkgname}.lcov" >> $GITHUB_ENV
3939
- name: Send coverage report to codecov.io
4040
uses: codecov/codecov-action@v2
@@ -60,7 +60,6 @@ jobs:
6060
swiftver:
6161
- swift:5.2
6262
- swift:5.5
63-
- swiftlang/swift:nightly-main
6463
swiftos:
6564
- focal
6665
container: ${{ format('{0}-{1}', matrix.swiftver, matrix.swiftos) }}
@@ -126,15 +125,10 @@ jobs:
126125
fail-fast: false
127126
matrix:
128127
dbimage:
129-
# Only test the lastest couple of versions on macOS, let Linux do the rest
128+
# Only test the lastest version on macOS, let Linux do the rest
130129
- postgresql@14
131-
- postgresql@13
132-
# - postgresql@12
133-
# - postgresql@11
134130
dbauth:
135131
# Only test one auth method on macOS, Linux tests will cover the others
136-
# - trust
137-
# - md5
138132
- scram-sha-256
139133
xcode:
140134
- latest-stable

0 commit comments

Comments
 (0)