From 59d6c2ef521aaf321de608675550f5c2993ccdd2 Mon Sep 17 00:00:00 2001
From: JP Simard <jp@jpsim.com>
Date: Sun, 20 Sep 2020 08:16:10 -0700
Subject: [PATCH] Test CI with official Swift 5.3 release (#3356)

---
 Makefile            |  2 +-
 azure-pipelines.yml | 14 ++++++++------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index 2e278ef21..44b5b4867 100644
--- a/Makefile
+++ b/Makefile
@@ -129,7 +129,7 @@ archive:
 release: package archive portable_zip zip_linux
 
 docker_test:
-	docker run -v `pwd`:`pwd` -w `pwd` --name swiftlint --rm norionomura/swift:5.2.4 swift test --parallel
+	docker run -v `pwd`:`pwd` -w `pwd` --name swiftlint --rm swift:5.3 swift test --parallel
 
 docker_htop:
 	docker run -it --rm --pid=container:swiftlint terencewestphal/htop || reset
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index d02d52b2a..aeb253602 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -12,6 +12,8 @@ jobs:
         containerImage: swift:5.1
       swift52:
         containerImage: swift:5.2
+      swift53:
+        containerImage: swift:5.3
   container: $[ variables['containerImage'] ]
   steps:
     - script: swift test --parallel
@@ -38,7 +40,7 @@ jobs:
       xcode116:
         DEVELOPER_DIR: /Applications/Xcode_11.6.app
       xcode12:
-        DEVELOPER_DIR: /Applications/Xcode_12_beta.app
+        DEVELOPER_DIR: /Applications/Xcode_12.app
   steps:
     - script: git submodule update --init --recursive
       displayName: Update git submodules
@@ -80,7 +82,7 @@ jobs:
       xcode116:
         DEVELOPER_DIR: /Applications/Xcode_11.6.app
       xcode12:
-        DEVELOPER_DIR: /Applications/Xcode_12_beta.app
+        DEVELOPER_DIR: /Applications/Xcode_12.app
   steps:
     - script: |
         sw_vers
@@ -95,7 +97,7 @@ jobs:
   pool:
     vmImage: 'macOS-10.15'
   variables:
-    DEVELOPER_DIR: /Applications/Xcode_11.6.app
+    DEVELOPER_DIR: /Applications/Xcode_12.app
   steps:
     - script: bundle install --path vendor/bundle
       displayName: bundle install
@@ -108,7 +110,7 @@ jobs:
   pool:
     vmImage: 'macOS-10.15'
   variables:
-    DEVELOPER_DIR: /Applications/Xcode_11.6.app
+    DEVELOPER_DIR: /Applications/Xcode_12.app
   steps:
     - script: make analyze
       displayName: Run SwiftLint Analyze
@@ -117,7 +119,7 @@ jobs:
   pool:
     vmImage: 'macOS-10.15'
   variables:
-    DEVELOPER_DIR: /Applications/Xcode_11.6.app
+    DEVELOPER_DIR: /Applications/Xcode_12.app
   steps:
     - script: swift run --sanitize=thread swiftlint lint --lenient
       displayName: Pre-cache SwiftLint Run
@@ -130,7 +132,7 @@ jobs:
   pool:
     vmImage: 'macOS-10.15'
   variables:
-    DEVELOPER_DIR: /Applications/Xcode_11.6.app
+    DEVELOPER_DIR: /Applications/Xcode_12.app
   steps:
     - script: swift run swiftlint generate-docs
       displayName: Run swiftlint generate-docs