Skip to content

Add doc/ to the target in Makefile and make the cabal command customizable #2830

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

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Add doc/ to the target in Makefile and make the cabal command customizable #2830

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
ba0bb48
Add stack yaml for GHC 9.10.2 (stackage lts-24.11)
shhyou Sep 22, 2025
0ce7f4b
Fix Everything.agda targets in Makefile
shhyou Sep 22, 2025
484521a
Allow customization of the cabal command
shhyou Sep 22, 2025
e0c37ce
Bump CI tag to Agda v2.8.0 (not RCs)
shhyou Sep 22, 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
2 changes: 1 addition & 1 deletion .github/workflows/ci-ubuntu.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ jobs:
echo "AGDA_HTML_DIR=html/experimental" >> "${GITHUB_ENV}"
else
# Pick Agda version for master
echo "AGDA_COMMIT=tags/v2.8.0-rc3" >> "${GITHUB_ENV}";
echo "AGDA_COMMIT=tags/v2.8.0" >> "${GITHUB_ENV}";
echo "AGDA_HTML_DIR=html/master" >> "${GITHUB_ENV}"
fi

Expand Down
20 changes: 11 additions & 9 deletions GNUmakefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,34 +2,36 @@ AGDA_EXEC ?= agda
AGDA_OPTIONS=-Werror
AGDA_RTS_OPTIONS=+RTS -M4.0G -H3.5G -A128M -RTS
AGDA=$(AGDA_EXEC) $(AGDA_OPTIONS) $(AGDA_RTS_OPTIONS)
CABAL_EXEC ?= cabal
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did you mean to call this CABAL (because you are referring to it as such below).

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oops thanks for catching the bug. I'll fix them later.

CABAL_RUN_COMMAND=$(CABAL_EXEC) run

# Before running `make test` the `fix-whitespace` program should
# be installed:
#
# cabal install fix-whitespace

test: Everything.agda check-whitespace
test: doc/Everything.agda check-whitespace
cd doc && $(AGDA) README.agda

testsuite:
$(MAKE) -C tests test AGDA="$(AGDA)" AGDA_EXEC="$(AGDA_EXEC)" only=$(only)

fix-whitespace:
cabal exec -- fix-whitespace
$(CABAL) exec -- fix-whitespace

check-whitespace:
cabal exec -- fix-whitespace --check
$(CABAL) exec -- fix-whitespace --check

setup: Everything.agda
setup: doc/Everything.agda

.PHONY: Everything.agda
Everything.agda:
cabal run GenerateEverything -- --out-dir doc
.PHONY: doc/Everything.agda
doc/Everything.agda:
$(CABAL_RUN_COMMAND) GenerateEverything -- --out-dir doc

.PHONY: listings
listings: Everything.agda
listings: doc/Everything.agda
cd doc && $(AGDA) --html README.agda -v0

clean :
find . -type f -name '*.agdai' -delete
rm -f Everything.agda EverythingSafe.agda
rm -f doc/Everything.agda doc/EverythingSafe.agda
5 changes: 5 additions & 0 deletions stack-9.10.2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
snapshot: lts-24.11
compiler: ghc-9.10.2
compiler-check: match-exact
packages:
- .