Skip to content

fix-whitespace fixes #435

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jespercockx merged 4 commits into from
Oct 8, 2025
Merged

fix-whitespace fixes #435

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
99f21d1
add fix-whitespace to the nix dev shell
liesnikov Oct 7, 2025
70bef20
check-whitespace is not a file, it's a target dependency
liesnikov Oct 8, 2025
c09353e
convert all targets to camel-case
liesnikov Oct 8, 2025
99ba82b
Install fix-whitespace on CI
liesnikov Oct 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,13 @@ jobs:
- name: Freeze
run: cabal freeze

# Install fix-whitespace since we need it for tests.
# This is done after the freeze to make sure we re-use the packages
- name: Install fix-whitespace
run: |
echo "import: cabal.project" > cabal.project.ci
cabal install fix-whitespace --project-file=cabal.project.ci

# Cache the contents of ~/.cabal/store to avoid rebuilding dependencies for
# every build. `restore-keys` makes it use the latest cache even if the
# fingerprint doesn't match, so we don't need to start from scratch every
Expand Down
10 changes: 5 additions & 5 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ test/agda2hs : $(FILES)
testContainers:
cd ./lib/containers && ./generate-haskell.sh && cabal build containers-prop

test : test/agda2hs testContainers
test : checkWhitespace test/agda2hs testContainers
make -C test

testHtml : test/agda2hs
Expand All @@ -40,12 +40,12 @@ docs :

FIXW_BIN = fix-whitespace

.PHONY : fix-whitespace ## Fix the whitespace issue.
fix-whitespace : have-bin-$(FIXW_BIN) fix-whitespace.yaml
.PHONY : fixWhitespace ## Fix the whitespace issue.
fixWhitespace : have-bin-$(FIXW_BIN) fix-whitespace.yaml
$(FIXW_BIN)

.PHONY : check-whitespace ## Check the whitespace issue without fixing it.
check-whitespace : have-bin-$(FIXW_BIN) fix-whitespace.yaml
.PHONY : checkWhitespace ## Check the whitespace issue without fixing it.
checkWhitespace : have-bin-$(FIXW_BIN) fix-whitespace.yaml
$(FIXW_BIN) --check

.PHONY : have-bin-% ## Installing binaries for developer services
Expand Down
1 change: 1 addition & 0 deletions nix/shell.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,6 @@ pkgs.haskellPackages.shellFor {
pkgs.agda
pkgs.nixfmt-rfc-style
cabal2nix
pkgs.haskellPackages.fix-whitespace
];
}
Loading