From 9e583e657396192bb38d3f38bf4ac362cd89a795 Mon Sep 17 00:00:00 2001 From: Lucas Bollen Date: Mon, 23 Sep 2024 09:33:54 +0200 Subject: [PATCH] Fix fourmulu check Paths were broken after separating `clash-protocols` in 2 packages --- .github/workflows/ci.yml | 5 ++--- format.sh | 3 ++- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1dd193b0..770e61ec 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -117,9 +117,8 @@ jobs: with: version: "0.14.0.0" pattern: | - src/**/*.hs - tests/**/*.hs - !src/Protocols/Cpp.hs + **/*.hs + !clash-protocols-base/src/Protocols/Cpp.hs linting: name: Source code linting diff --git a/format.sh b/format.sh index 9f73a7da..3c39cb99 100755 --- a/format.sh +++ b/format.sh @@ -25,6 +25,7 @@ fi exclude_files=( "clash-protocols-base/src/Protocols/Cpp.hs" + "dist-newstyle" ) # Make sure it doesn't matter from where this script is executed @@ -34,7 +35,7 @@ cd $DIR if [ $1 == "diff" ] ; then src_files=$(git diff --cached --name-only --diff-filter=ACMR -- '*.hs') else - src_files=$(find clash-protocols-base/Setup.hs clash-protocols/Setup.hs clash-protocols-base/src clash-protocols/src clash-protocols/tests -type f -name "*.hs") + src_files=$(find -type f -name "*.hs") fi src_files_str=$(printf "%s\n" "${src_files[@]}" | sed 's| |\\ |g')