Skip to content

Commit da2a404

Browse files
authored
Add CI for Swift 5.8 and update nightly to Ubuntu 22.04 (#21)
1 parent f1e49d0 commit da2a404

File tree

3 files changed

+28
-6
lines changed

3 files changed

+28
-6
lines changed

docker/docker-compose.2004.57.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ services:
66
image: swift-cassandra-client:20.04-5.7
77
build:
88
args:
9-
base_image: "swiftlang/swift:nightly-5.7-focal"
9+
ubuntu_version: "focal"
10+
swift_version: "5.7"
1011

1112
build:
1213
image: swift-cassandra-client:20.04-5.7

docker/docker-compose.2004.main.yaml renamed to docker/docker-compose.2004.58.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,19 @@ version: "3"
33
services:
44

55
runtime-setup:
6-
image: swift-cassandra-client:20.04-main
6+
image: swift-cassandra-client:20.04-5.8
77
build:
88
args:
9-
base_image: "swiftlang/swift:nightly-main-focal"
9+
base_image: "swiftlang/swift:nightly-5.8-focal"
1010

1111
build:
12-
image: swift-cassandra-client:20.04-main
12+
image: swift-cassandra-client:20.04-5.8
1313

1414
test:
15-
image: swift-cassandra-client:20.04-main
15+
image: swift-cassandra-client:20.04-5.8
1616
environment: []
1717
#- SANITIZER_ARG: "--sanitize=thread"
1818
#- TSAN_OPTIONS: "no_huge_pages_for_shadow=0 suppressions=/code/tsan_suppressions.txt"
1919

2020
shell:
21-
image: swift-cassandra-client:20.04-main
21+
image: swift-cassandra-client:20.04-5.8
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
version: "3"
2+
3+
services:
4+
5+
runtime-setup:
6+
image: swift-cassandra-client:22.04-main
7+
build:
8+
args:
9+
base_image: "swiftlang/swift:nightly-main-jammy"
10+
11+
build:
12+
image: swift-cassandra-client:22.04-main
13+
14+
test:
15+
image: swift-cassandra-client:22.04-main
16+
environment: []
17+
#- SANITIZER_ARG: "--sanitize=thread"
18+
#- TSAN_OPTIONS: "no_huge_pages_for_shadow=0 suppressions=/code/tsan_suppressions.txt"
19+
20+
shell:
21+
image: swift-cassandra-client:22.04-main

0 commit comments

Comments
 (0)