From ba0bb48c975380002824495968aa1c54d05364e4 Mon Sep 17 00:00:00 2001 From: shhyou Date: Mon, 22 Sep 2025 16:04:21 +0800 Subject: [PATCH 1/4] Add stack yaml for GHC 9.10.2 (stackage lts-24.11) --- stack-9.10.2.yaml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 stack-9.10.2.yaml 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: +- . From 0ce7f4b2d2775ff6a95d846e8df3b369cb4e2d47 Mon Sep 17 00:00:00 2001 From: shhyou Date: Mon, 22 Sep 2025 16:24:34 +0800 Subject: [PATCH 2/4] Fix Everything.agda targets in Makefile --- GNUmakefile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/GNUmakefile b/GNUmakefile index e744f066cc..23d5cc44fa 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -8,7 +8,7 @@ AGDA=$(AGDA_EXEC) $(AGDA_OPTIONS) $(AGDA_RTS_OPTIONS) # # cabal install fix-whitespace -test: Everything.agda check-whitespace +test: doc/Everything.agda check-whitespace cd doc && $(AGDA) README.agda testsuite: @@ -20,16 +20,16 @@ fix-whitespace: check-whitespace: cabal exec -- fix-whitespace --check -setup: Everything.agda +setup: doc/Everything.agda -.PHONY: Everything.agda -Everything.agda: +.PHONY: doc/Everything.agda +doc/Everything.agda: cabal run 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 From 484521aa20931b5de3d456dc278aa727e8d8172d Mon Sep 17 00:00:00 2001 From: shhyou Date: Mon, 22 Sep 2025 16:34:50 +0800 Subject: [PATCH 3/4] Allow customization of the cabal command --- GNUmakefile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/GNUmakefile b/GNUmakefile index 23d5cc44fa..9308ded76c 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -2,6 +2,8 @@ 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: @@ -15,16 +17,16 @@ 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: doc/Everything.agda .PHONY: doc/Everything.agda doc/Everything.agda: - cabal run GenerateEverything -- --out-dir doc + $(CABAL_RUN_COMMAND) GenerateEverything -- --out-dir doc .PHONY: listings listings: doc/Everything.agda From e0c37ce87dd9dfefb8336debf30325adb2a73ea8 Mon Sep 17 00:00:00 2001 From: shhyou Date: Mon, 22 Sep 2025 17:54:38 +0800 Subject: [PATCH 4/4] Bump CI tag to Agda v2.8.0 (not RCs) --- .github/workflows/ci-ubuntu.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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