Commit 9d1f3c3c authored by Ralf Jung's avatar Ralf Jung

update CI for opam 2

parent bc89b4bd
Pipeline #11751 failed with stage
in 23 minutes and 48 seconds
...@@ -8,7 +8,7 @@ all: Makefile.coq ...@@ -8,7 +8,7 @@ all: Makefile.coq
clean: Makefile.coq clean: Makefile.coq
+@make -f Makefile.coq clean +@make -f Makefile.coq clean
find theories \( -name "*.v.d" -o -name "*.vo" -o -name "*.aux" -o -name "*.cache" -o -name "*.glob" -o -name "*.vio" \) -print -delete find theories $$(test -d tests && echo tests) \( -name "*.d" -o -name "*.vo" -o -name "*.aux" -o -name "*.cache" -o -name "*.glob" -o -name "*.vio" \) -print -delete
rm -f Makefile.coq rm -f Makefile.coq
.PHONY: clean .PHONY: clean
...@@ -33,7 +33,7 @@ build-dep: build-dep/opam phony ...@@ -33,7 +33,7 @@ build-dep: build-dep/opam phony
@# dependencies, but does not actually install anything. @# dependencies, but does not actually install anything.
@# Reinstalling is needed with opam 1 in case the pin already exists, but the builddep @# Reinstalling is needed with opam 1 in case the pin already exists, but the builddep
@# package changed. @# 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 && \
((! opam --version | grep "^1\." > /dev/null) || ( \ ((! opam --version | grep "^1\." > /dev/null) || ( \
......
Subproject commit 99c935d2007358fe4028560e96f9c136e608e696 Subproject commit c3b53061d2452f7ea50766915eb40312163d155a
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