Merge pull request #2896 from realm/mf-swift-5.1-linux

Run CI on Swift 5.1 + Linux
realm · Oct 9, 2019 · 495407b · 495407b
2 parents 2dcaf3e + e10a012
commit 495407b
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -31,6 +31,10 @@
 * Make `toggle_bool` rule substitution correctable.  
   [MaxHaertwig](https://github.com/maxhaertwig)
 
+* Support building with Swift 5.1 on Linux.  
+  [Marcelo Fabri](https://github.com/marcelofabri)
+  [#2874](https://github.com/realm/SwiftLint/issues/2874)
+
 #### Bug Fixes
 
 * None.

diff --git a/Makefile b/Makefile
@@ -122,7 +122,7 @@ archive:
 release: package archive portable_zip
 
 docker_test:
-	docker run -v `pwd`:`pwd` -w `pwd` --name swiftlint --rm norionomura/swift:42 swift test --parallel
+	docker run -v `pwd`:`pwd` -w `pwd` --name swiftlint --rm norionomura/swift:51 swift test --parallel
 
 docker_htop:
 	docker run -it --rm --pid=container:swiftlint terencewestphal/htop || reset

diff --git a/Package.swift b/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version:4.0
+// swift-tools-version:5.0
 import PackageDescription
 
 #if canImport(CommonCrypto)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -10,6 +10,8 @@ jobs:
     matrix:
       swift50:
         containerImage: swift:5.0
+      swift51:
+        containerImage: swift:5.1
   container: $[ variables['containerImage'] ]
   steps:
     - script: swift test --parallel