Skip to content

Commit 31e1cb6

Browse files
authored
Merge pull request #90 from math-comp/ci
Fix CI by reverting to coq_makefile
2 parents 05ce627 + 22dde70 commit 31e1cb6

File tree

6 files changed

+28
-40
lines changed

6 files changed

+28
-40
lines changed

.github/workflows/ci.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@ jobs:
1818
- mathcomp/mathcomp:2.2.0-coq-8.17
1919
- mathcomp/mathcomp:2.2.0-coq-8.18
2020
- mathcomp/mathcomp:2.2.0-coq-8.19
21-
- mathcomp/mathcomp-dev:coq-8.16
22-
- mathcomp/mathcomp-dev:coq-8.17
2321
- mathcomp/mathcomp-dev:coq-8.18
2422
- mathcomp/mathcomp-dev:coq-8.19
2523
- mathcomp/mathcomp-dev:coq-dev

Makefile

Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,25 @@
1-
# -*- Makefile -*-
1+
# KNOWNTARGETS will not be passed along to CoqMakefile
2+
KNOWNTARGETS := Makefile.coq
3+
# KNOWNFILES will not get implicit targets from the final rule, and so
4+
# depending on them won't invoke the submake
5+
# Warning: These files get declared as PHONY, so any targets depending
6+
# on them always get rebuilt
7+
KNOWNFILES := Makefile _CoqProject
28

3-
# --------------------------------------------------------------------
4-
DUNEOPTS ?=
5-
DUNE := dune $(DUNEOPTS)
9+
.DEFAULT_GOAL := invoke-coqmakefile
610

7-
# --------------------------------------------------------------------
8-
.PHONY: default build clean
11+
Makefile.coq: Makefile _CoqProject
12+
$(COQBIN)coq_makefile -f _CoqProject -o Makefile.coq
913

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

12-
build:
13-
$(DUNE) build
17+
.PHONY: invoke-coqmakefile $(KNOWNFILES)
1418

15-
install:
16-
$(DUNE) install
19+
####################################################################
20+
## Your targets here ##
21+
####################################################################
1722

18-
clean:
19-
$(DUNE) clean
23+
# This should be the last rule, to handle any targets not declared above
24+
%: invoke-coqmakefile
25+
@true

_CoqProject

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
1+
src/freeg.v
2+
src/monalg.v
3+
src/mpoly.v
4+
src/ssrcomplements.v
5+
src/xfinmap.v
6+
7+
-R src mathcomp.multinomials
18
-arg -w -arg -ambiguous-paths
29
-arg -w -arg -notation-overridden
310
-arg -w -arg -redundant-canonical-projection
411
-arg -w -arg -projection-no-head-constant
5-
6-
-R _build/default/src mathcomp.multinomials

coq-mathcomp-multinomials.opam

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,10 @@ bug-reports: "https://github.com/math-comp/multinomials/issues"
55
dev-repo: "git+https://github.com/math-comp/multinomials.git"
66
license: "CECILL-B"
77
authors: ["Pierre-Yves Strub"]
8-
build: [
9-
[ "dune" "build" "-p" name "-j" jobs ]
10-
]
8+
build: [make "-j%{jobs}%"]
9+
install: [make "install"]
1110
depends: [
1211
"coq" {(>= "8.16" & < "8.20~") | = "dev"}
13-
"dune" {>= "3.8"}
1412
"coq-mathcomp-ssreflect" {(>= "2.0" & < "2.3~") | = "dev"}
1513
"coq-mathcomp-algebra"
1614
"coq-mathcomp-bigenough" {(>= "1.0" & < "1.1~") | = "dev"}

dune-project

Lines changed: 0 additions & 3 deletions
This file was deleted.

src/dune

Lines changed: 0 additions & 16 deletions
This file was deleted.

0 commit comments

Comments
 (0)