From 369cc82c920f1d777b879a99cf1164dbc29192b3 Mon Sep 17 00:00:00 2001
From: tom doron <tomer@apple.com>
Date: Fri, 3 Apr 2020 18:04:28 -0700
Subject: [PATCH] update ci setup

motivation: 5.2 adoption, prepare for 5.3

changes:
* add 5.2 docker-compose setup
* add 5.3 docker-compose setup (placeholder)
* format
---
 .swiftformat                       |  1 -
 docker/Dockerfile                  |  2 +-
 docker/docker-compose.1804.52.yaml |  3 ++-
 docker/docker-compose.1804.53.yaml | 15 +++++++++++++++
 4 files changed, 18 insertions(+), 3 deletions(-)
 create mode 100644 docker/docker-compose.1804.53.yaml

diff --git a/.swiftformat b/.swiftformat
index 19ee383f..864dbb8d 100644
--- a/.swiftformat
+++ b/.swiftformat
@@ -8,7 +8,6 @@
 --self insert
 --patternlet inline
 --stripunusedargs unnamed-only
---comments ignore
 --ifdef no-indent
 
 # rules
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 2311a42c..cfd977cd 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -30,7 +30,7 @@ RUN chmod 755 $HOME/.tools/symbolicate-linux-fatal
 
 # swiftformat (until part of the toolchain)
 
-ARG swiftformat_version=0.44.0
+ARG swiftformat_version=0.44.6
 RUN git clone --branch $swiftformat_version --depth 1 https://github.com/nicklockwood/SwiftFormat $HOME/.tools/swift-format
 RUN cd $HOME/.tools/swift-format && swift build -c release
 RUN ln -s $HOME/.tools/swift-format/.build/release/swiftformat $HOME/.tools/swiftformat
diff --git a/docker/docker-compose.1804.52.yaml b/docker/docker-compose.1804.52.yaml
index 33ec2295..af7b0a87 100644
--- a/docker/docker-compose.1804.52.yaml
+++ b/docker/docker-compose.1804.52.yaml
@@ -6,7 +6,8 @@ services:
     image: swift-aws-lambda:18.04-5.2
     build:
       args:
-        base_image: "swiftlang/swift:nightly-5.2-bionic"
+        ubuntu_version: "bionic"
+        swift_version: "5.2"
 
   test:
     image: swift-aws-lambda:18.04-5.2
diff --git a/docker/docker-compose.1804.53.yaml b/docker/docker-compose.1804.53.yaml
new file mode 100644
index 00000000..e200426c
--- /dev/null
+++ b/docker/docker-compose.1804.53.yaml
@@ -0,0 +1,15 @@
+version: "3"
+
+services:
+
+  runtime-setup:
+    image: swift-aws-lambda:18.04-5.3
+    build:
+      args:
+        base_image: "swiftlang/swift:nightly-bionic"
+
+  test:
+    image: swift-aws-lambda:18.04-5.3
+
+  shell:
+    image: swift-aws-lambda:18.04-5.3