From c44546e933d4d78aa333b5c21d68f79bd1f8fcc4 Mon Sep 17 00:00:00 2001 From: Li-yao Xia Date: Sat, 31 Oct 2026 00:14:07 +0100 Subject: [PATCH 1/3] Reduce dependencies of Events.Exception --- theories/Events/Exception.v | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/theories/Events/Exception.v b/theories/Events/Exception.v index 96dc45eb..258444cf 100644 --- a/theories/Events/Exception.v +++ b/theories/Events/Exception.v @@ -1,7 +1,7 @@ (** * Exception event *) (* begin hide *) -From ITree Require Import ITree. +From ITree Require Import Basics.Basics Core.ITreeDefinition Core.Subevent Indexed.Sum. Set Implicit Arguments. (* end hide *) From 5a88a89efbb3f54401a78bad214b28eff84b5ae5 Mon Sep 17 00:00:00 2001 From: Li-yao Xia Date: Sat, 31 Oct 2026 00:14:22 +0100 Subject: [PATCH 2/3] Fix depgraph --- Makefile | 8 +++----- depgraph.sh | 15 +++++++++++++++ 2 files changed, 18 insertions(+), 5 deletions(-) create mode 100644 depgraph.sh diff --git a/Makefile b/Makefile index 0b8899c7..bf6dd5a9 100644 --- a/Makefile +++ b/Makefile @@ -49,14 +49,14 @@ _CoqProject: $(COQPATHFILE) _CoqProject.itree _CoqProject.extra Makefile @ echo "# Generating _CoqProject" @ rm -f _CoqProject @ echo "# THIS IS AN AUTOMATICALLY GENERATED FILE" >> _CoqProject - @ echo "# PLEASE EDIT _CoqConfig INSTEAD" >> _CoqProject + @ echo "# PLEASE EDIT _CoqProject.itree or _CoqPRoject.extra INSTEAD" >> _CoqProject @ echo >> _CoqProject ifneq ("$(COQPATHFILE)","") @ echo "# including: _CoqPath" @ cat _CoqPath >> _CoqProject @ echo >> _CoqProject endif - @ echo "# including: _CoqConfig" + @ echo "# including: _CoqProject.itree _CoqProject.extra" @ cat _CoqProject.itree _CoqProject.extra >> _CoqProject COQDEP=coqdep @@ -64,6 +64,4 @@ DEPS_DOT=deps.dot DEPS_OUT=deps.jpg depgraph: - $(COQDEP) -dumpgraph $(DEPS_DOT) $(shell cat _CoqConfig) > /dev/null 2>&1 - sed 's%\("theories/\([^"]*\)/\([^"/]*\)"\[label="\)%\1\2/\\n%' -i $(DEPS_DOT) - dot $(DEPS_DOT) -Tjpg -o$(DEPS_OUT) + sh depgraph.sh diff --git a/depgraph.sh b/depgraph.sh new file mode 100644 index 00000000..c4b966e1 --- /dev/null +++ b/depgraph.sh @@ -0,0 +1,15 @@ +# Script adapted from https://discourse.rocq-prover.org/t/tool-for-drawing-coq-project-dependency-graph/653/16 +( echo "digraph interval_deps {" ; + echo "node [shape=ellipse, style=filled, URL=\"html/ITree.html\"];"; + ( coqdep $(cat _CoqProject.itree) ) | + sed -n -e 's,theories/,,g;s,[^ ]*worker,,g;s,/,.,g;s/[.]vo.*: [^ ]*[.]v//p' | + while read src dst; do + color=$(echo "$src" | sed -e 's,Eq.*,turquoise,;s,Basics[.].*,plum,;s,Handler.*,lightcoral,;s,Core.*,yellow,;s,Indexed.*,cornflowerblue,;s,Interp.*,green,;s,Events.*,orange,;s,Props.*,olive,;s,[A-Z].*,white,') + echo "\"$src\" [fillcolor=$color];" + for d in $dst; do + echo "\"$src\" -> \"${d%.vo}\" ;" + done + done; + echo "}" ) | tred > deps.dot +dot -T png deps.dot > deps.png +# dot -T cmap deps.dot | sed -e 's,>$,/>,' > deps.map From 6d12a03e096e732ea81ba3f8ab9b126ef1b62e23 Mon Sep 17 00:00:00 2001 From: Li-yao Xia Date: Sat, 31 Oct 2026 11:18:15 +0100 Subject: [PATCH 3/3] ci: Use a different version of OCaml for coq-8.14 and 8.15 --- .github/workflows/docker-action.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker-action.yml b/.github/workflows/docker-action.yml index a6377348..4f852052 100644 --- a/.github/workflows/docker-action.yml +++ b/.github/workflows/docker-action.yml @@ -17,8 +17,8 @@ jobs: strategy: matrix: image: - - 'coqorg/coq:8.14' - - 'coqorg/coq:8.15' + - 'coqorg/coq:8.14-ocaml-4.14-flambda' + - 'coqorg/coq:8.15-ocaml-4.14-flambda' - 'coqorg/coq:8.16' - 'coqorg/coq:8.17' - 'coqorg/coq:8.18'