Skip to content

Commit 8c86f11

Browse files
Merge branch 'develop' of https://github.com/GetStream/stream-feeds-swift into develop
2 parents 2f37afd + e77f1b1 commit 8c86f11

File tree

2 files changed

+17
-3
lines changed

2 files changed

+17
-3
lines changed

fastlane/Fastfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ lane :sources_matrix do
215215
ruby: ['fastlane', 'Gemfile', 'Gemfile.lock'],
216216
size: ['Sources', xcode_project],
217217
swiftformat_include: ['Sources', 'DemoApp', 'Tests'],
218-
swiftformat_exclude: ["**/Generated", "**/generated", "**/protobuf", "**/OpenApi"]
218+
swiftformat_exclude: ['**/Generated', '**/generated', '**/protobuf', '**/OpenApi']
219219
}
220220
end
221221

lefthook.yml

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,21 @@
11
pre-commit:
2-
parallel: true
2+
parallel: false
33
jobs:
4-
- run: bundle exec fastlane run_swift_format
4+
- run: mint run swiftformat --config .swiftformat --exclude '**/Generated', '**/generated', '**/protobuf', '**/OpenApi' {staged_files}
5+
glob: "*.{swift}"
6+
stage_fixed: true
7+
skip:
8+
- merge
9+
- rebase
10+
11+
- run: mint run swiftlint lint --config .swiftlint.yml --fix --progress --quiet --reporter json {staged_files}
12+
glob: "*.{swift}"
13+
stage_fixed: true
14+
skip:
15+
- merge
16+
- rebase
17+
18+
- run: mint run swiftlint lint --config .swiftlint.yml --strict --progress --quiet --reporter json {staged_files}
519
glob: "*.{swift}"
620
stage_fixed: true
721
skip:

0 commit comments

Comments
 (0)