build: Fix lint

remko · Jun 12, 2024 · 18bda76 · 18bda76
1 parent c0dd581
commit 18bda76
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -24,7 +24,8 @@ jobs:
       - run: make lint
         # We don't have swift-format on Linux yet
         if: runner.os == 'macOS'
-      - run: make package package-linux
+      # Temporarily run this in the build to avoid surprises at release time
+      - run: make package-linux
         env:
           TOOLCHAINS: swift
         if: runner.os == 'macOS'

diff --git a/Makefile b/Makefile
@@ -76,9 +76,11 @@ test-loop: test
 	reflex -r '\.swift$$' $(MAKE) test
 
 
+# Need to explicitly list source dirs instead of `.`, because swift-format doesn't ignore
+# hidden dirs. Should be fixed 'soon'? (https://github.com/apple/swift-format/pull/644)
 .PHONY: lint
 lint:
-	swift-format lint --recursive --strict .
+	swift-format lint --recursive --strict Package.swift Sources Scripts Tests
 
 .PHONY: install 
 install: install-doc