diff --git a/.github/workflows/ci-ubuntu.yml b/.github/workflows/ci-ubuntu.yml index 0a421f0ae7..d6464d33dd 100644 --- a/.github/workflows/ci-ubuntu.yml +++ b/.github/workflows/ci-ubuntu.yml @@ -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 diff --git a/GNUmakefile b/GNUmakefile index e744f066cc..9308ded76c 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -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 +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 diff --git a/stack-9.10.2.yaml b/stack-9.10.2.yaml new file mode 100644 index 0000000000..8a163bc5e8 --- /dev/null +++ b/stack-9.10.2.yaml @@ -0,0 +1,5 @@ +snapshot: lts-24.11 +compiler: ghc-9.10.2 +compiler-check: match-exact +packages: +- .