Commit 262c9d8a authored by Ralf Jung's avatar Ralf Jung

update CI

parent 629187f1
...@@ -31,13 +31,15 @@ build-dep: build-dep/opam phony ...@@ -31,13 +31,15 @@ build-dep: build-dep/opam phony
@# that are incompatible with our build requirements. @# that are incompatible with our build requirements.
@# To achieve this, we create a fake opam package that has our build-dependencies as @# To achieve this, we create a fake opam package that has our build-dependencies as
@# dependencies, but does not actually install anything. @# dependencies, but does not actually install anything.
@# Reinstalling is needed in case the pin already exists, but the builddep package changed. @# Reinstalling is needed with opam 1 in case the pin already exists, but the builddep
@# Once we depend on opam 2, we can remove that last step. @# package changed.
@BUILD_DEP_PACKAGE="$$(egrep "^name:" build-dep/opam | sed 's/^name: *"\(.*\)" */\1/')"; \ @BUILD_DEP_PACKAGE="$$(egrep "^name:" build-dep/opam | sed 's/^name: *"\(.*\)" */\1/')"; \
echo "# Pinning build-dep package." && \ echo "# Pinning build-dep package." && \
opam pin add -k path $(OPAMFLAGS) "$$BUILD_DEP_PACKAGE".dev build-dep && \ opam pin add -k path $(OPAMFLAGS) "$$BUILD_DEP_PACKAGE".dev build-dep && \
echo "# Reinstalling build-dep package." && \ ((! opam --version | grep "^1\." > /dev/null) || ( \
opam reinstall $(OPAMFLAGS) "$$BUILD_DEP_PACKAGE" echo "# Reinstalling build-dep package." && \
opam reinstall $(OPAMFLAGS) "$$BUILD_DEP_PACKAGE" \
))
# Some files that do *not* need to be forwarded to Makefile.coq # Some files that do *not* need to be forwarded to Makefile.coq
Makefile: ; Makefile: ;
......
Subproject commit 40b71102efe051c777a785035aebcbaa4c2ec19f Subproject commit 99c935d2007358fe4028560e96f9c136e608e696
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment