Skip to content

Commit e070de8

Browse files
committed
Merge branch 'main' into redundant_extension
* main: Use explicit version for Bundler (realm#5395) Add destination to xcodebuild test instructions (realm#5392) Support Swift version 5.9.2 (realm#5391)
2 parents ee386d6 + 3d29c67 commit e070de8

File tree

3 files changed

+4
-2
lines changed

3 files changed

+4
-2
lines changed

.buildkite/pipeline.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ steps:
2020
- label: "Danger"
2121
commands:
2222
- echo "--- Install Bundler"
23-
- gem install bundler
23+
- gem install bundler -v 2.4.22
2424
- echo "--- Bundle Install"
2525
- bundle install
2626
- echo "+++ Run Danger"

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ with Swift Package Manager on Linux. When contributing code changes, please
5757
ensure that all three supported build methods continue to work and pass tests.
5858

5959
```shell
60-
$ xcodebuild -scheme swiftlint test
60+
$ xcodebuild -scheme swiftlint test -destination 'platform=macOS'
6161
$ swift test
6262
$ make docker_test
6363
```

Tests/SwiftLintFrameworkTests/SwiftVersionTests.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ final class SwiftVersionTests: SwiftLintTestCase {
55
func testDetectSwiftVersion() {
66
#if compiler(>=6.0.0)
77
let version = "6.0.0"
8+
#elseif compiler(>=5.9.2)
9+
let version = "5.9.2"
810
#elseif compiler(>=5.9.1)
911
let version = "5.9.1"
1012
#elseif compiler(>=5.9.0)

0 commit comments

Comments
 (0)