Skip to content

Commit 32e8d72

Browse files
authored
Add CI for Swift 5.8 and update nightly to Ubuntu 22.04 (apple#255)
1 parent b2eff1c commit 32e8d72

File tree

3 files changed

+24
-5
lines changed

3 files changed

+24
-5
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-log:20.04-5.7
77
build:
88
args:
9-
base_image: "swiftlang/swift:nightly-main-focal"
9+
ubuntu_version: "focal"
10+
swift_version: "5.7"
1011

1112
test:
1213
image: swift-log:20.04-5.7

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

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

55
runtime-setup:
6-
image: swift-log:20.04-main
6+
image: swift-log: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
test:
12-
image: swift-log:20.04-main
12+
image: swift-log:20.04-5.8
1313
environment:
1414
- FORCE_TEST_DISCOVERY=--enable-test-discovery
1515
#- SANITIZER_ARG=--sanitize=thread
1616

1717
shell:
18-
image: swift-log:20.04-main
18+
image: swift-log:20.04-5.8

docker/docker-compose.2204.main.yaml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
version: "3"
2+
3+
services:
4+
5+
runtime-setup:
6+
image: swift-log:22.04-main
7+
build:
8+
args:
9+
base_image: "swiftlang/swift:nightly-main-jammy"
10+
11+
test:
12+
image: swift-log:22.04-main
13+
environment:
14+
- FORCE_TEST_DISCOVERY=--enable-test-discovery
15+
#- SANITIZER_ARG=--sanitize=thread
16+
17+
shell:
18+
image: swift-log:22.04-main

0 commit comments

Comments
 (0)