Skip to content

Commit 46a27fb

Browse files
committed
Revert "Temporarily drop xcbeautify"
This reverts commit 1f58315. # Conflicts: # Makefile
1 parent 17224a1 commit 46a27fb

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

Makefile

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,26 +33,25 @@ build:
3333
run:
3434
swift run
3535

36-
test:
36+
test: xcbeautify
3737
set -o pipefail \
38-
&& swift test --disable-automatic-resolution --sanitize=thread
38+
&& swift test --disable-automatic-resolution --sanitize=thread \
39+
2>&1 | ./xcbeautify --renderer github-actions
3940

40-
test-query-performance:
41+
test-query-performance: xcbeautify
4142
set -o pipefail \
4243
&& env RUN_QUERY_PERFORMANCE_TESTS=true \
4344
swift test --disable-automatic-resolution \
4445
--filter QueryPerformanceTests \
4546
2>&1 | tee test.log
4647
grep "ℹ️" test.log
47-
grep -v "\] Compiling" test.log
48+
grep -v "\] Compiling" test.log | ./xcbeautify --renderer github-actions
4849

4950
test-fast:
5051
@echo Skipping image snapshot tests
5152
@echo Running without --sanitize=thread
5253
swift test --disable-automatic-resolution
5354

54-
# Need to temporarily drop xcbeautify due to a compiler crash with Swift 6.1 nightlies:
55-
# https://github.com/swiftlang/swift/issues/80240
5655
xcbeautify:
5756
rm -rf .build/checkouts/xcbeautify
5857
git clone https://github.com/cpisciotta/xcbeautify.git .build/checkouts/xcbeautify

0 commit comments

Comments
 (0)