Skip to content

Commit 71eae27

Browse files
committed
[misc] [ci] [windows] Some more nits form Rocq / Coq migration
1 parent bf828d3 commit 71eae27

File tree

3 files changed

+8
-3
lines changed

3 files changed

+8
-3
lines changed

.github/workflows/build.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,11 @@ jobs:
6969

7070
- name: 🐛 Special Windows Config [only on Win CI]
7171
if: matrix.os == 'windows-latest'
72-
run: opam exec -- make winconfig
72+
run: |
73+
# Waiting on ocamlfind 1.9.8
74+
# c.f. https://github.com/ocaml/opam-repository/pull/27253
75+
opam pin add --dev ocamlfind
76+
opam exec -- make winconfig
7377
7478
- name: 🧱 Build coq-lsp
7579
run: opam exec -- make build

Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,8 @@ make-fmt: build fmt
147147
.PHONY: opam-update-and-reinstall
148148
opam-update-and-reinstall:
149149
git pull --recurse-submodules
150-
for pkg in rocq-runtime coq-core rocq-core stdlib/coq-stdlib coqide-server coq; do opam install -y vendor/coq/$$pkg.opam; done
150+
for pkg in rocq-runtime coq-core rocq-core coqide-server rocq coq; do opam install -y vendor/coq/$$pkg.opam; done
151+
for pkg in rocq-stdlib coq-stdlib; do opam install -y vendor/coq-stdlib/$$pkg.opam; done
151152
opam install .
152153

153154
.PHONY: patch-for-js

coq/workspace.ml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ let make ~cmdline ~implicit ~kind ~debug =
172172
in
173173
let require_libs =
174174
let rq_list =
175-
if init then ((None, "Stdlib.Init.Prelude") :: require_libraries) @ libs
175+
if init then ((None, "Corelib.Init.Prelude") :: require_libraries) @ libs
176176
else require_libraries @ libs
177177
in
178178
List.map mk_require_from rq_list

0 commit comments

Comments
 (0)