Skip to content

Commit dede451

Browse files
authored
update ci setup (#56)
motivation: 5.2 adoption, prepare for 5.3 changes: * add 5.2 docker-compose setup * add 5.3 docker-compose setup (placeholder) * format
1 parent 7a94606 commit dede451

File tree

4 files changed

+18
-3
lines changed

4 files changed

+18
-3
lines changed

.swiftformat

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
--self insert
99
--patternlet inline
1010
--stripunusedargs unnamed-only
11-
--comments ignore
1211
--ifdef no-indent
1312

1413
# rules

docker/Dockerfile

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

3131
# swiftformat (until part of the toolchain)
3232

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

docker/docker-compose.1804.52.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ services:
66
image: swift-aws-lambda:18.04-5.2
77
build:
88
args:
9-
base_image: "swiftlang/swift:nightly-5.2-bionic"
9+
ubuntu_version: "bionic"
10+
swift_version: "5.2"
1011

1112
test:
1213
image: swift-aws-lambda:18.04-5.2

docker/docker-compose.1804.53.yaml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
version: "3"
2+
3+
services:
4+
5+
runtime-setup:
6+
image: swift-aws-lambda:18.04-5.3
7+
build:
8+
args:
9+
base_image: "swiftlang/swift:nightly-bionic"
10+
11+
test:
12+
image: swift-aws-lambda:18.04-5.3
13+
14+
shell:
15+
image: swift-aws-lambda:18.04-5.3

0 commit comments

Comments
 (0)