Skip to content

Commit 88bc0ba

Browse files
committed
Invoke swift-format instead of swift format in check-swift-format.sh
This allows us to override the `swift-format` executable to a locally built copy by adding the locally built version to PATH in swiftlang/swift-format#1093.
1 parent 30fccd9 commit 88bc0ba

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

.github/workflows/scripts/check-swift-format.sh

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,19 +21,19 @@ fatal() { error "$@"; exit 1; }
2121
if [[ -f .swiftformatignore ]]; then
2222
log "Found swiftformatignore file..."
2323

24-
log "Running swift format format..."
25-
tr '\n' '\0' < .swiftformatignore| xargs -0 -I% printf '":(exclude)%" '| xargs git ls-files -z '*.swift' | xargs -0 swift format format --parallel --in-place
24+
log "Running swift-format format..."
25+
tr '\n' '\0' < .swiftformatignore| xargs -0 -I% printf '":(exclude)%" '| xargs git ls-files -z '*.swift' | xargs -0 swift-format format --parallel --in-place
2626

27-
log "Running swift format lint..."
27+
log "Running swift-format lint..."
2828

29-
tr '\n' '\0' < .swiftformatignore | xargs -0 -I% printf '":(exclude)%" '| xargs git ls-files -z '*.swift' | xargs -0 swift format lint --strict --parallel
29+
tr '\n' '\0' < .swiftformatignore | xargs -0 -I% printf '":(exclude)%" '| xargs git ls-files -z '*.swift' | xargs -0 swift-format lint --strict --parallel
3030
else
31-
log "Running swift format format..."
32-
git ls-files -z '*.swift' | xargs -0 swift format format --parallel --in-place
31+
log "Running swift-format format..."
32+
git ls-files -z '*.swift' | xargs -0 swift-format format --parallel --in-place
3333

34-
log "Running swift format lint..."
34+
log "Running swift-format lint..."
3535

36-
git ls-files -z '*.swift' | xargs -0 swift format lint --strict --parallel
36+
git ls-files -z '*.swift' | xargs -0 swift-format lint --strict --parallel
3737
fi
3838

3939

0 commit comments

Comments
 (0)