Skip to content

Commit b7628eb

Browse files
authored
add docker compose setup for swift 5.8 (#129)
motivation: prepare for swift 5.8 changes: * update use of Locks to address NIO warnings * update docker compose setup to use release version of 5.7 * add docker compose setup for 5.8
1 parent fbdb075 commit b7628eb

File tree

3 files changed

+24
-4
lines changed

3 files changed

+24
-4
lines changed

Tests/LifecycleTests/Helpers.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
//===----------------------------------------------------------------------===//
1414

1515
import Foundation
16-
import Lifecycle
16+
@testable import Lifecycle
1717
import NIO
1818
import NIOConcurrencyHelpers
1919

@@ -25,7 +25,7 @@ class GoodItem: LifecycleTask {
2525
let shutdownDelay: Double
2626

2727
var state = State.idle
28-
let stateLock = Lock()
28+
let stateLock = Lifecycle.Lock()
2929

3030
init(id: String = UUID().uuidString,
3131
startDelay: Double = Double.random(in: 0.01 ... 0.1),
@@ -67,7 +67,7 @@ class NIOItem {
6767
let shutdownDelay: Int64
6868

6969
var state = State.idle
70-
let stateLock = Lock()
70+
let stateLock = Lifecycle.Lock()
7171

7272
init(eventLoopGroup: EventLoopGroup,
7373
id: String = UUID().uuidString,

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-service-lifecycle: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-service-lifecycle:20.04-5.7

docker/docker-compose.2004.58.yaml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
version: "3"
2+
3+
services:
4+
5+
runtime-setup:
6+
image: swift-service-lifecycle:20.04-5.8
7+
build:
8+
args:
9+
ubuntu_version: "focal"
10+
swift_version: "5.8"
11+
12+
test:
13+
image: swift-service-lifecycle:20.04-5.8
14+
environment:
15+
- SKIP_SIGNAL_TEST=true
16+
- FORCE_TEST_DISCOVERY=--enable-test-discovery
17+
18+
shell:
19+
image: swift-service-lifecycle:20.04-5.8

0 commit comments

Comments
 (0)