Skip to content

Commit

Permalink
Merge pull request #90 from math-comp/ci
Browse files Browse the repository at this point in the history
Fix CI by reverting to coq_makefile
  • Loading branch information
pi8027 authored Jul 15, 2024
2 parents 05ce627 + 22dde70 commit 31e1cb6
Show file tree
Hide file tree
Showing 6 changed files with 28 additions and 40 deletions.
2 changes: 0 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@ jobs:
- mathcomp/mathcomp:2.2.0-coq-8.17
- mathcomp/mathcomp:2.2.0-coq-8.18
- mathcomp/mathcomp:2.2.0-coq-8.19
- mathcomp/mathcomp-dev:coq-8.16
- mathcomp/mathcomp-dev:coq-8.17
- mathcomp/mathcomp-dev:coq-8.18
- mathcomp/mathcomp-dev:coq-8.19
- mathcomp/mathcomp-dev:coq-dev
Expand Down
32 changes: 19 additions & 13 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,19 +1,25 @@
# -*- Makefile -*-
# KNOWNTARGETS will not be passed along to CoqMakefile
KNOWNTARGETS := Makefile.coq
# KNOWNFILES will not get implicit targets from the final rule, and so
# depending on them won't invoke the submake
# Warning: These files get declared as PHONY, so any targets depending
# on them always get rebuilt
KNOWNFILES := Makefile _CoqProject

# --------------------------------------------------------------------
DUNEOPTS ?=
DUNE := dune $(DUNEOPTS)
.DEFAULT_GOAL := invoke-coqmakefile

# --------------------------------------------------------------------
.PHONY: default build clean
Makefile.coq: Makefile _CoqProject
$(COQBIN)coq_makefile -f _CoqProject -o Makefile.coq

default: build
invoke-coqmakefile: Makefile.coq
$(MAKE) --no-print-directory -f Makefile.coq $(filter-out $(KNOWNTARGETS),$(MAKECMDGOALS))

build:
$(DUNE) build
.PHONY: invoke-coqmakefile $(KNOWNFILES)

install:
$(DUNE) install
####################################################################
## Your targets here ##
####################################################################

clean:
$(DUNE) clean
# This should be the last rule, to handle any targets not declared above
%: invoke-coqmakefile
@true
9 changes: 7 additions & 2 deletions _CoqProject
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
src/freeg.v
src/monalg.v
src/mpoly.v
src/ssrcomplements.v
src/xfinmap.v

-R src mathcomp.multinomials
-arg -w -arg -ambiguous-paths
-arg -w -arg -notation-overridden
-arg -w -arg -redundant-canonical-projection
-arg -w -arg -projection-no-head-constant

-R _build/default/src mathcomp.multinomials
6 changes: 2 additions & 4 deletions coq-mathcomp-multinomials.opam
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,10 @@ bug-reports: "https://github.com/math-comp/multinomials/issues"
dev-repo: "git+https://github.com/math-comp/multinomials.git"
license: "CECILL-B"
authors: ["Pierre-Yves Strub"]
build: [
[ "dune" "build" "-p" name "-j" jobs ]
]
build: [make "-j%{jobs}%"]
install: [make "install"]
depends: [
"coq" {(>= "8.16" & < "8.20~") | = "dev"}
"dune" {>= "3.8"}
"coq-mathcomp-ssreflect" {(>= "2.0" & < "2.3~") | = "dev"}
"coq-mathcomp-algebra"
"coq-mathcomp-bigenough" {(>= "1.0" & < "1.1~") | = "dev"}
Expand Down
3 changes: 0 additions & 3 deletions dune-project

This file was deleted.

16 changes: 0 additions & 16 deletions src/dune

This file was deleted.

0 comments on commit 31e1cb6

Please sign in to comment.