Skip to content

Commit 1111d30

Browse files
authored
swift 5.1 docker setup (#97)
motivation: support swift 5.1 changes: * add docker compose file for swift 5.1, will add CI job once merged * update swiftformat version to 0.40.12 * fix warning in tests
1 parent e5a4bd1 commit 1111d30

File tree

3 files changed

+15
-2
lines changed

3 files changed

+15
-2
lines changed

Tests/LoggingTests/LoggingTest.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@ class LoggingTest: XCTestCase {
295295
print("new multi")
296296
return multi
297297
}
298-
var logger1: Logger = {
298+
let logger1: Logger = {
299299
var logger = Logger(label: "foo")
300300
logger.logLevel = .debug
301301
logger[metadataKey: "only-on"] = "first"

docker/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ RUN chmod 755 $HOME/.tools/symbolicate-linux-fatal
2929

3030
# swiftformat (until part of the toolchain)
3131

32-
ARG swiftformat_version=0.40.11
32+
ARG swiftformat_version=0.40.12
3333
RUN git clone --branch $swiftformat_version --depth 1 https://github.com/nicklockwood/SwiftFormat $HOME/.tools/swift-format
3434
RUN cd $HOME/.tools/swift-format && swift build -c release
3535
RUN ln -s $HOME/.tools/swift-format/.build/release/swiftformat $HOME/.tools/swiftformat

docker/docker-compose.1804.51.yaml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
version: "3"
2+
3+
services:
4+
5+
runtime-setup:
6+
image: swift-log:18.04-5.1
7+
build:
8+
args:
9+
ubuntu_version: "bionic"
10+
swift_version: "5.1"
11+
12+
test:
13+
image: swift-log:18.04-5.1

0 commit comments

Comments
 (0)