File tree 6 files changed +41
-5
lines changed
6 files changed +41
-5
lines changed Original file line number Diff line number Diff line change 1
1
# file options
2
2
3
+ --swiftversion 5.0
3
4
--exclude .build
4
5
5
6
# format options
6
7
7
8
--self insert
8
9
--patternlet inline
9
10
--stripunusedargs unnamed-only
10
- --comments ignore
11
11
--ranges nospace
12
12
13
13
# rules
Original file line number Diff line number Diff line change 1
1
ARG swift_version=5.0
2
2
ARG ubuntu_version=bionic
3
- FROM swift:$swift_version-$ubuntu_version
3
+ ARG base_image=swift:$swift_version-$ubuntu_version
4
+ FROM $base_image
4
5
# needed to do again after FROM due to docker limitation
5
6
ARG swift_version
6
7
ARG ubuntu_version
@@ -29,7 +30,7 @@ RUN chmod 755 $HOME/.tools/symbolicate-linux-fatal
29
30
30
31
# swiftformat (until part of the toolchain)
31
32
32
- ARG swiftformat_version=0.40.12
33
+ ARG swiftformat_version=0.44.6
33
34
RUN git clone --branch $swiftformat_version --depth 1 https://github.com/nicklockwood/SwiftFormat $HOME/.tools/swift-format
34
35
RUN cd $HOME/.tools/swift-format && swift build -c release
35
36
RUN ln -s $HOME/.tools/swift-format/.build/release/swiftformat $HOME/.tools/swiftformat
Original file line number Diff line number Diff line change @@ -7,7 +7,7 @@ services:
7
7
build :
8
8
args :
9
9
ubuntu_version : " xenial"
10
- swift_version : " 5.1.3 "
10
+ swift_version : " 5.1"
11
11
12
12
test :
13
13
image : async-http-client:16.04-5.1
Original file line number Diff line number Diff line change @@ -7,7 +7,7 @@ services:
7
7
build :
8
8
args :
9
9
ubuntu_version : " bionic"
10
- swift_version : " 5.1.3 "
10
+ swift_version : " 5.1"
11
11
12
12
test :
13
13
image : async-http-client:18.04-5.1
Original file line number Diff line number Diff line change
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
Original file line number Diff line number Diff line change
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
You can’t perform that action at this time.
0 commit comments