From 484b255777c084c2ededaabcc6b295c764726c2f Mon Sep 17 00:00:00 2001 From: Emilio Jesus Gallego Arias Date: Tue, 24 Jun 2025 14:18:58 +0200 Subject: [PATCH] [ci] [refs] Remove waterproof-exercises for now --- .github/workflows/ci.yml | 2 +- .gitmodules | 3 --- Makefile | 13 +++++++++++++ waterproof-exercises | 1 - 4 files changed, 14 insertions(+), 5 deletions(-) delete mode 160000 waterproof-exercises diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6ac03d1..a1ebea3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -42,7 +42,7 @@ jobs: - name: 🔭 Checkout code uses: actions/checkout@v4 with: - submodules: recursive + submodules: true - name: 🐫 Setup OCaml uses: ocaml/setup-ocaml@v3 diff --git a/.gitmodules b/.gitmodules index 3ed67ee..5686103 100644 --- a/.gitmodules +++ b/.gitmodules @@ -10,6 +10,3 @@ [submodule "coq-waterproof"] path = coq-waterproof url = git@github.com:impermeable/coq-waterproof.git -[submodule "waterproof-exercises"] - path = waterproof-exercises - url = git@gitlab.tue.nl:impermeable/waterproof-exercises.git diff --git a/Makefile b/Makefile index 7086752..97bf5cb 100644 --- a/Makefile +++ b/Makefile @@ -18,6 +18,19 @@ rocq/config/coq_config.ml: rocq && cp theories/dune.disabled theories/dune \ && cp user-contrib/Ltac2/dune.disabled user-contrib/Ltac2/dune +# We set windows parameters a bit better, note the need to use forward +# slashed (cygpath -m) due to escaping :( , a conversion to `-w` is +# welcomed if someones has time for this +.PHONY: winconfig +winconfig: + EPATH=$(shell cygpath -am .) \ + && cd vendor/coq \ + && ./configure -no-ask -prefix "$$EPATH\\_build\\install\\default\\" \ + -libdir "$$EPATH\\_build\\install\\default\\lib\\coq\\" \ + -native-compiler no \ + && cp theories/dune.disabled theories/dune \ + && cp user-contrib/Ltac2/dune.disabled user-contrib/Ltac2/dune + .PHONY: clean clean: dune clean diff --git a/waterproof-exercises b/waterproof-exercises deleted file mode 160000 index 1b4c16a..0000000 --- a/waterproof-exercises +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 1b4c16a2e4047ed44ddb7d8e5976d0f08629e13e