Skip to content

Commit 83531fd

Browse files
committed
update ci setup
motivation: 5.2 adoption, prepare for 5.3 changes: * use 5.2 docker-compose setup * add 5.3 docker-compose setup (placeholder) * update format
1 parent 2d88de3 commit 83531fd

6 files changed

+41
-5
lines changed

.swiftformat

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
# file options
22

3+
--swiftversion 5.0
34
--exclude .build
45

56
# format options
67

78
--self insert
89
--patternlet inline
910
--stripunusedargs unnamed-only
10-
--comments ignore
1111
--ranges nospace
1212

1313
# rules

docker/Dockerfile

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
ARG swift_version=5.0
22
ARG ubuntu_version=bionic
3-
FROM swift:$swift_version-$ubuntu_version
3+
ARG base_image=swift:$swift_version-$ubuntu_version
4+
FROM $base_image
45
# needed to do again after FROM due to docker limitation
56
ARG swift_version
67
ARG ubuntu_version
@@ -29,7 +30,7 @@ RUN chmod 755 $HOME/.tools/symbolicate-linux-fatal
2930

3031
# swiftformat (until part of the toolchain)
3132

32-
ARG swiftformat_version=0.40.12
33+
ARG swiftformat_version=0.44.6
3334
RUN git clone --branch $swiftformat_version --depth 1 https://github.com/nicklockwood/SwiftFormat $HOME/.tools/swift-format
3435
RUN cd $HOME/.tools/swift-format && swift build -c release
3536
RUN ln -s $HOME/.tools/swift-format/.build/release/swiftformat $HOME/.tools/swiftformat

docker/docker-compose.1604.51.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ services:
77
build:
88
args:
99
ubuntu_version: "xenial"
10-
swift_version: "5.1.3"
10+
swift_version: "5.1"
1111

1212
test:
1313
image: async-http-client:16.04-5.1

docker/docker-compose.1804.51.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ services:
77
build:
88
args:
99
ubuntu_version: "bionic"
10-
swift_version: "5.1.3"
10+
swift_version: "5.1"
1111

1212
test:
1313
image: async-http-client:18.04-5.1

docker/docker-compose.1804.52.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: swift-metrics:18.04-5.2
7+
build:
8+
args:
9+
ubuntu_version: "bionic"
10+
swift_version: "5.2"
11+
12+
test:
13+
image: swift-metrics:18.04-5.2
14+
environment: []
15+
#- SANITIZER_ARG=--sanitize=thread
16+
17+
shell:
18+
image: swift-metrics:18.04-5.2

docker/docker-compose.1804.53.yaml

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
version: "3"
2+
3+
services:
4+
5+
runtime-setup:
6+
image: async-http-client:18.04-5.3
7+
build:
8+
args:
9+
base_image: "swiftlang/swift:nightly-master-bionic"
10+
11+
test:
12+
image: async-http-client:18.04-5.3
13+
environment: []
14+
#- SANITIZER_ARG=--sanitize=thread
15+
16+
shell:
17+
image: async-http-client:18.04-5.3

0 commit comments

Comments
 (0)