From 83531fd02fbf8c78bf448bd1001fe15eddb8741c Mon Sep 17 00:00:00 2001
From: tom doron <tomer@apple.com>
Date: Fri, 3 Apr 2020 18:39:55 -0700
Subject: [PATCH 1/2] 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
---
 .swiftformat                       |  2 +-
 docker/Dockerfile                  |  5 +++--
 docker/docker-compose.1604.51.yaml |  2 +-
 docker/docker-compose.1804.51.yaml |  2 +-
 docker/docker-compose.1804.52.yaml | 18 ++++++++++++++++++
 docker/docker-compose.1804.53.yaml | 17 +++++++++++++++++
 6 files changed, 41 insertions(+), 5 deletions(-)
 create mode 100644 docker/docker-compose.1804.52.yaml
 create mode 100644 docker/docker-compose.1804.53.yaml

diff --git a/.swiftformat b/.swiftformat
index 0dcf6d346..3e81e26de 100644
--- a/.swiftformat
+++ b/.swiftformat
@@ -1,5 +1,6 @@
 # file options
 
+--swiftversion 5.0
 --exclude .build
 
 # format options
@@ -7,7 +8,6 @@
 --self insert
 --patternlet inline
 --stripunusedargs unnamed-only
---comments ignore
 --ranges nospace
 
 # rules
diff --git a/docker/Dockerfile b/docker/Dockerfile
index e80e1135b..984698515 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,6 +1,7 @@
 ARG swift_version=5.0
 ARG ubuntu_version=bionic
-FROM swift:$swift_version-$ubuntu_version
+ARG base_image=swift:$swift_version-$ubuntu_version
+FROM $base_image
 # needed to do again after FROM due to docker limitation
 ARG swift_version
 ARG ubuntu_version
@@ -29,7 +30,7 @@ RUN chmod 755 $HOME/.tools/symbolicate-linux-fatal
 
 # swiftformat (until part of the toolchain)
 
-ARG swiftformat_version=0.40.12
+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.1604.51.yaml b/docker/docker-compose.1604.51.yaml
index 3d738695f..4949e2f2c 100644
--- a/docker/docker-compose.1604.51.yaml
+++ b/docker/docker-compose.1604.51.yaml
@@ -7,7 +7,7 @@ services:
     build:
       args:
         ubuntu_version: "xenial"
-        swift_version: "5.1.3"
+        swift_version: "5.1"
 
   test:
     image: async-http-client:16.04-5.1
diff --git a/docker/docker-compose.1804.51.yaml b/docker/docker-compose.1804.51.yaml
index 559564c08..1ca7a60a3 100644
--- a/docker/docker-compose.1804.51.yaml
+++ b/docker/docker-compose.1804.51.yaml
@@ -7,7 +7,7 @@ services:
     build:
       args:
         ubuntu_version: "bionic"
-        swift_version: "5.1.3"
+        swift_version: "5.1"
 
   test:
     image: async-http-client:18.04-5.1
diff --git a/docker/docker-compose.1804.52.yaml b/docker/docker-compose.1804.52.yaml
new file mode 100644
index 000000000..ee6f33cfc
--- /dev/null
+++ b/docker/docker-compose.1804.52.yaml
@@ -0,0 +1,18 @@
+version: "3"
+
+services:
+
+  runtime-setup:
+    image: swift-metrics:18.04-5.2
+    build:
+      args:
+        ubuntu_version: "bionic"
+        swift_version: "5.2"
+
+  test:
+    image: swift-metrics:18.04-5.2
+    environment: []
+      #- SANITIZER_ARG=--sanitize=thread
+
+  shell:
+    image: swift-metrics: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 000000000..7cbb20d8e
--- /dev/null
+++ b/docker/docker-compose.1804.53.yaml
@@ -0,0 +1,17 @@
+version: "3"
+
+services:
+
+  runtime-setup:
+    image: async-http-client:18.04-5.3
+    build:
+      args:
+        base_image: "swiftlang/swift:nightly-master-bionic"
+
+  test:
+    image: async-http-client:18.04-5.3
+    environment: []
+      #- SANITIZER_ARG=--sanitize=thread
+
+  shell:
+    image: async-http-client:18.04-5.3

From 796a0f6c9330cb254f4ea6e4601fdb5bd7d2e86b Mon Sep 17 00:00:00 2001
From: tomer doron <tomerd@apple.com>
Date: Sat, 4 Apr 2020 09:47:04 -0700
Subject: [PATCH 2/2] Update docker-compose.1804.52.yaml

---
 docker/docker-compose.1804.52.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docker/docker-compose.1804.52.yaml b/docker/docker-compose.1804.52.yaml
index ee6f33cfc..b40f3355c 100644
--- a/docker/docker-compose.1804.52.yaml
+++ b/docker/docker-compose.1804.52.yaml
@@ -3,16 +3,16 @@ version: "3"
 services:
 
   runtime-setup:
-    image: swift-metrics:18.04-5.2
+    image: async-http-client:18.04-5.2
     build:
       args:
         ubuntu_version: "bionic"
         swift_version: "5.2"
 
   test:
-    image: swift-metrics:18.04-5.2
+    image: async-http-client:18.04-5.2
     environment: []
       #- SANITIZER_ARG=--sanitize=thread
 
   shell:
-    image: swift-metrics:18.04-5.2
+    image: async-http-client:18.04-5.2