From 53fc63a93fbceb6af91c50506c197f5af478b5e0 Mon Sep 17 00:00:00 2001
From: Sebastiaan van Stijn <github@gone.nl>
Date: Fri, 4 Jan 2019 21:32:29 +0100
Subject: [PATCH 1/2] Circle-CI: fix indentation in circle.yml

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
---
 circle.yml | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/circle.yml b/circle.yml
index 720a2a4dca..daad921544 100644
--- a/circle.yml
+++ b/circle.yml
@@ -8,9 +8,9 @@ jobs:
     steps:
       - checkout
       - setup_remote_docker:
-            version: 18.03.1-ce
-            reusable: true
-            exclusive: false
+          version: 18.03.1-ce
+          reusable: true
+          exclusive: false
       - run:
           command: docker version
       - run:
@@ -26,9 +26,9 @@ jobs:
     steps:
       - checkout
       - setup_remote_docker:
-            version: 18.03.1-ce
-            reusable: true
-            exclusive: false
+          version: 18.03.1-ce
+          reusable: true
+          exclusive: false
       - run:
           name: "Cross"
           command: |
@@ -50,9 +50,9 @@ jobs:
     steps:
       - checkout
       - setup_remote_docker:
-            version: 18.03.1-ce
-            reusable: true
-            exclusive: false
+          version: 18.03.1-ce
+          reusable: true
+          exclusive: false
       - run:
           name: "Unit Test with Coverage"
           command: |
@@ -86,9 +86,9 @@ jobs:
     steps:
       - checkout
       - setup_remote_docker:
-            version: 18.03.1-ce
-            reusable: true
-            exclusive: false
+          version: 18.03.1-ce
+          reusable: true
+          exclusive: false
       - run:
           name: "Validate Vendor, Docs, and Code Generation"
           command: |
@@ -103,9 +103,9 @@ jobs:
     steps:
       - checkout
       - setup_remote_docker:
-            version: 18.03.1-ce
-            reusable: true
-            exclusive: false
+          version: 18.03.1-ce
+          reusable: true
+          exclusive: false
       - run:
           name: "Run shellcheck"
           command: |

From 8b19c1d73af85110f819a27f42b5e0a4c3020e48 Mon Sep 17 00:00:00 2001
From: Sebastiaan van Stijn <github@gone.nl>
Date: Fri, 4 Jan 2019 21:58:44 +0100
Subject: [PATCH 2/2] Update CircleCI Docker version to 18.09.3

18.03 has reached EOL; let's use a more current version in CI

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
---
 circle.yml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/circle.yml b/circle.yml
index daad921544..f7fefcc013 100644
--- a/circle.yml
+++ b/circle.yml
@@ -4,11 +4,11 @@ jobs:
 
   lint:
     working_directory: /work
-    docker: [{image: 'docker:18.03-git'}]
+    docker: [{image: 'docker:18.09-git'}]
     steps:
       - checkout
       - setup_remote_docker:
-          version: 18.03.1-ce
+          version: 18.09.3
           reusable: true
           exclusive: false
       - run:
@@ -21,12 +21,12 @@ jobs:
 
   cross:
     working_directory: /work
-    docker: [{image: 'docker:18.03-git'}]
+    docker: [{image: 'docker:18.09-git'}]
     parallelism: 3
     steps:
       - checkout
       - setup_remote_docker:
-          version: 18.03.1-ce
+          version: 18.09.3
           reusable: true
           exclusive: false
       - run:
@@ -46,11 +46,11 @@ jobs:
 
   test:
     working_directory: /work
-    docker: [{image: 'docker:18.03-git'}]
+    docker: [{image: 'docker:18.09-git'}]
     steps:
       - checkout
       - setup_remote_docker:
-          version: 18.03.1-ce
+          version: 18.09.3
           reusable: true
           exclusive: false
       - run:
@@ -82,11 +82,11 @@ jobs:
 
   validate:
     working_directory: /work
-    docker: [{image: 'docker:18.03-git'}]
+    docker: [{image: 'docker:18.09-git'}]
     steps:
       - checkout
       - setup_remote_docker:
-          version: 18.03.1-ce
+          version: 18.09.3
           reusable: true
           exclusive: false
       - run:
@@ -99,11 +99,11 @@ jobs:
           no_output_timeout: 15m
   shellcheck:
     working_directory: /work
-    docker: [{image: 'docker:18.03-git'}]
+    docker: [{image: 'docker:18.09-git'}]
     steps:
       - checkout
       - setup_remote_docker:
-          version: 18.03.1-ce
+          version: 18.09.3
           reusable: true
           exclusive: false
       - run: