Simplify SwiftFormat Invocations (#662)

Automattic · Feb 11, 2025 · 9d25fac · 9d25fac
2 parents 38d3755 + a684644
commit 9d25fac
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 9 deletions.
diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
@@ -29,11 +29,7 @@ steps:
         plugins:
           - docker#v5.12.0:
               image: "ghcr.io/nicklockwood/swiftformat:$SWIFTFORMAT_VERSION"
-              command: ["--lint", "Sources"]
-              workdir: "${BUILDKITE_BUILD_CHECKOUT_PATH}"
-          - docker#v5.12.0:
-              image: "ghcr.io/nicklockwood/swiftformat:$SWIFTFORMAT_VERSION"
-              command: ["--lint", "Tests"]
+              command: ["Sources", "Tests", "--lint"]
               workdir: "${BUILDKITE_BUILD_CHECKOUT_PATH}"
         notify:
           - github_commit_status:

diff --git a/Makefile b/Makefile
@@ -69,12 +69,10 @@ setup-secrets: bundle-install
 	bundle exec fastlane run configure_apply
 
 swiftformat: check-docker # Automatically find and fixes lint issues
-	@docker run --rm -v $(shell pwd):$(shell pwd) -w $(shell pwd) ghcr.io/nicklockwood/swiftformat:$(SWIFTFORMAT_VERSION) Sources
-	@docker run --rm -v $(shell pwd):$(shell pwd) -w $(shell pwd) ghcr.io/nicklockwood/swiftformat:$(SWIFTFORMAT_VERSION) Tests
+	@docker run --rm -v $(shell pwd):$(shell pwd) -w $(shell pwd) ghcr.io/nicklockwood/swiftformat:$(SWIFTFORMAT_VERSION) Sources Tests
 
 swiftformat-lint: check-docker
-	@docker run --rm -v $(shell pwd):$(shell pwd) -w $(shell pwd) ghcr.io/nicklockwood/swiftformat:$(SWIFTFORMAT_VERSION) --lint Sources
-	@docker run --rm -v $(shell pwd):$(shell pwd) -w $(shell pwd) ghcr.io/nicklockwood/swiftformat:$(SWIFTFORMAT_VERSION) --lint Tests
+	@docker run --rm -v $(shell pwd):$(shell pwd) -w $(shell pwd) ghcr.io/nicklockwood/swiftformat:$(SWIFTFORMAT_VERSION) Sources Tests --lint
 
 swiftlint: docker-swiftlint-builder swiftlint-run # Sets up the buildx builder and runs the swiftlint command