Skip to content

Commit 5daaa38

Browse files
authored
Add Swift 5.8 CI and update nightly CI to Ubuntu 22.04 (#655)
* Add Swift 5.8 CI * Update nightly CI to Ubuntu 22.04 * Fix warnings in test target with latest NIO release Replace calls to `.wait()` with calls to `.get()`
1 parent 7f05a8d commit 5daaa38

File tree

3 files changed

+25
-7
lines changed

3 files changed

+25
-7
lines changed

Tests/AsyncHTTPClientTests/AsyncAwaitEndToEndTests.swift

+3-3
Original file line numberDiff line numberDiff line change
@@ -416,9 +416,9 @@ final class AsyncAwaitEndToEndTests: XCTestCase {
416416
XCTAssertNoThrow(try serverChannel.close().wait())
417417
}
418418
let port = serverChannel.localAddress!.port!
419-
let firstClientChannel = try ClientBootstrap(group: self.serverGroup)
419+
let firstClientChannel = try await ClientBootstrap(group: self.serverGroup)
420420
.connect(host: "127.0.0.1", port: port)
421-
.wait()
421+
.get()
422422
defer {
423423
XCTAssertNoThrow(try firstClientChannel.close().wait())
424424
}
@@ -464,7 +464,7 @@ final class AsyncAwaitEndToEndTests: XCTestCase {
464464
.childChannelInitializer { channel in
465465
channel.pipeline.addHandler(NIOSSLServerHandler(context: sslContext))
466466
}
467-
let serverChannel = try server.bind(host: "localhost", port: 0).wait()
467+
let serverChannel = try await server.bind(host: "localhost", port: 0).get()
468468
defer { XCTAssertNoThrow(try serverChannel.close().wait()) }
469469
let port = serverChannel.localAddress!.port!
470470

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@ version: "3"
33
services:
44

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

1111
test:
12-
image: async-http-client:20.04-main
12+
image: async-http-client:22.04-5.8
1313
environment:
1414
- IMPORT_CHECK_ARG=--explicit-target-dependency-import-check error
1515
#- SANITIZER_ARG=--sanitize=thread
1616

1717
shell:
18-
image: async-http-client:20.04-main
18+
image: async-http-client:22.04-5.8

docker/docker-compose.2204.main.yaml

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
version: "3"
2+
3+
services:
4+
5+
runtime-setup:
6+
image: async-http-client:22.04-main
7+
build:
8+
args:
9+
base_image: "swiftlang/swift:nightly-main-jammy"
10+
11+
test:
12+
image: async-http-client:22.04-main
13+
environment:
14+
- IMPORT_CHECK_ARG=--explicit-target-dependency-import-check error
15+
#- SANITIZER_ARG=--sanitize=thread
16+
17+
shell:
18+
image: async-http-client:22.04-main

0 commit comments

Comments
 (0)