Skip to content

Commit 2a27a59

Browse files
committed
Merge branch 'update-test-matrix' into 'master'
Update Test Matrix to include Swift 5.1 Official Release See merge request Mordil/swift-redi-stack!83
2 parents 9741a2e + 3c4b5c4 commit 2a27a59

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

.gitlab-ci.yml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ build 5.0:ubuntu-xenial:
4747
image: swift:5.0-xenial
4848
build 5.1:ubuntu-xenial:
4949
extends: .build
50-
image: norionomura/swift:swift-5.1-branch
50+
image: swift:5.1-xenial
5151
build latest:ubuntu-xenial:
5252
extends: .build
5353
image: norionomura/swift:nightly
@@ -56,6 +56,9 @@ build latest:ubuntu-xenial:
5656
build 5.0:ubuntu-bionic:
5757
extends: .build
5858
image: swift:5.0-bionic
59+
build 5.1ubuntu-bionic:
60+
extends: .build
61+
image: swift:5.1-bionic
5962

6063
.test:
6164
stage: Test
@@ -77,7 +80,7 @@ test 5.0:ubuntu-xenial:
7780
image: swift:5.0-xenial
7881
test 5.1:ubuntu-xenial:
7982
extends: .test
80-
image: norionomura/swift:swift-5.1-branch
83+
image: swift:5.1-xenial
8184
test latest:ubuntu-xenial:
8285
extends: .test
8386
image: norionomura/swift:nightly
@@ -86,3 +89,6 @@ test latest:ubuntu-xenial:
8689
test 5.0:ubuntu-bionic:
8790
extends: .test
8891
image: swift:5.0-bionic
92+
test 5.1:ubuntu-bionic:
93+
extends: .test
94+
image: swift:5.1-bionic

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ receive regular unit testing (either in development, or with CI).
103103
| Swift Version | macOS Mojave | Ubuntu 16.04 (Xenial) | Ubuntu 18.04 (Bionic) |
104104
|---|:---:|:---:|:---:|
105105
| 5.0 | X | X | X |
106-
| 5.1 | X | X | |
106+
| 5.1 | X | X | X |
107107
| Trunk | X | X | |
108108

109109
## License

0 commit comments

Comments
 (0)