Skip to content

Commit

Permalink
Merge branch 'master' into patch-1
Browse files Browse the repository at this point in the history
  • Loading branch information
liyishuai authored Dec 4, 2024
2 parents f7a8807 + 97d1ade commit 077dc6b
Show file tree
Hide file tree
Showing 392 changed files with 10,268 additions and 296 deletions.
7 changes: 6 additions & 1 deletion .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ before_script:

.opam-build:
stage: build
tags:
- medium
script: |
PR=${CI_COMMIT_REF_NAME##pr-};
echo "Github PR number: $PR";
Expand All @@ -48,6 +50,8 @@ before_script:
# Json
json-data:
stage: build
tags:
- medium
variables:
COMPILER: "4.11.2"
script: |
Expand All @@ -66,6 +70,8 @@ json-data:
# Lint
opam-lint:
stage: lint
tags:
- medium
variables:
COMPILER: "4.11.2"
script:
Expand Down Expand Up @@ -97,7 +103,6 @@ opam-build:5.0.0:
extends: .opam-build
variables:
COMPILER: "5.0.0"
tags: [ saas-linux-medium-amd64 ]
except:
- web

Expand Down
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -97,4 +97,6 @@ Pipeline" green button at <https://gitlab.com/coq/opam-coq-archive/pipelines>.
This will then build only on runners without pre-set timeouts (the Coq Pyrolyse
server). It may still time out if the build takes longer than the GitLab
project's timeout setting (24 hours). To skip some packages the first PR
message can contain a line such as `ci-skip: p1.v1 p2.v2` where `p1` and `p2` are package names, and `v1` and `v2` are versions.
message can contain a line such as `ci-skip: p1.v1 p2 p3.v3 p4` where
`p1`, `p2`, `p3` and `p4` are package names, and `v1` and `v3` are
versions (when no versions are given, skip all versions).
2 changes: 1 addition & 1 deletion core-dev/packages/coq-core/coq-core.8.19+rc1/opam
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ homepage: "https://coq.inria.fr/"
doc: "https://coq.github.io/doc/"
bug-reports: "https://github.com/coq/coq/issues"
depends: [
"dune" {>= "2.9"}
"dune" {>= "2.9" & < "3.14"}
"ocaml" {>= "4.09.0"}
"ocamlfind" {>= "1.8.1"}
"zarith" {>= "1.11"}
Expand Down
2 changes: 1 addition & 1 deletion core-dev/packages/coq-core/coq-core.8.19.dev/opam
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ homepage: "https://coq.inria.fr/"
doc: "https://coq.github.io/doc/"
bug-reports: "https://github.com/coq/coq/issues"
depends: [
"dune" {>= "2.9"}
"dune" {>= "2.9" & < "3.14"}
"ocaml" {>= "4.09.0"}
"ocamlfind" {>= "1.8.1"}
"zarith" {>= "1.11"}
Expand Down
68 changes: 68 additions & 0 deletions core-dev/packages/coq-core/coq-core.8.20+rc1/opam
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
opam-version: "2.0"
synopsis: "The Coq Proof Assistant -- Core Binaries and Tools"
description: """
Coq is a formal proof management system. It provides
a formal language to write mathematical definitions, executable
algorithms and theorems together with an environment for
semi-interactive development of machine-checked proofs.

Typical applications include the certification of properties of
programming languages (e.g. the CompCert compiler certification
project, or the Bedrock verified low-level programming library), the
formalization of mathematics (e.g. the full formalization of the
Feit-Thompson theorem or homotopy type theory) and teaching.

This package includes the Coq core binaries, plugins, and tools, but
not the vernacular standard library.

Note that in this setup, Coq needs to be started with the -boot and
-noinit options, as will otherwise fail to find the regular Coq
prelude, now living in the coq-stdlib package."""
maintainer: ["The Coq development team <[email protected]>"]
authors: ["The Coq development team, INRIA, CNRS, and contributors"]
license: "LGPL-2.1-only"
homepage: "https://coq.inria.fr/"
doc: "https://coq.github.io/doc/"
bug-reports: "https://github.com/coq/coq/issues"
depends: [
"dune" {>= "3.6.1" & < "3.14"}
"ocaml" {>= "4.09.0"}
"ocamlfind" {>= "1.8.1"}
"zarith" {>= "1.11"}
"conf-linux-libc-dev" {os = "linux"}
"odoc" {with-doc}
]
conflicts: [
"coq" { < "8.17" }
]
depopts: ["coq-native" "memprof-limits" "memtrace"]
dev-repo: "git+https://github.com/coq/coq.git"
build: [
["dune" "subst"] {dev}
[ "./configure"
"-prefix" prefix
"-mandir" man
"-libdir" "%{lib}%/coq"
"-native-compiler" "yes" {coq-native:installed} "no" {!coq-native:installed}
]
[
"dune"
"build"
"-p"
name
"-j"
jobs
"--promote-install-files=false"
"@install"
"@runtest" {with-test}
"@doc" {with-doc}
]
["dune" "install" "-p" name "--create-install-files" name]
]
url {
src: "https://github.com/coq/coq/releases/download/V8.20+rc1/coq-8.20-rc1.tar.gz"
checksum: [
"md5=3a50a9d2768cf5dd0190afbd81f97051"
"sha512=895730028bb00a6b0c71d2b3fdff6d215f6bcc40a8223b20f7e1ce15a6cea0b3ca2243babeeac39653db887ae0147f98fb9e808d1b1b9b9e26baf2bc849c82ab"
]
}
65 changes: 65 additions & 0 deletions core-dev/packages/coq-core/coq-core.8.20.dev/opam
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
opam-version: "2.0"
synopsis: "The Coq Proof Assistant -- Core Binaries and Tools"
description: """
Coq is a formal proof management system. It provides
a formal language to write mathematical definitions, executable
algorithms and theorems together with an environment for
semi-interactive development of machine-checked proofs.

Typical applications include the certification of properties of
programming languages (e.g. the CompCert compiler certification
project, or the Bedrock verified low-level programming library), the
formalization of mathematics (e.g. the full formalization of the
Feit-Thompson theorem or homotopy type theory) and teaching.

This package includes the Coq core binaries, plugins, and tools, but
not the vernacular standard library.

Note that in this setup, Coq needs to be started with the -boot and
-noinit options, as will otherwise fail to find the regular Coq
prelude, now living in the coq-stdlib package."""
maintainer: ["The Coq development team <[email protected]>"]
authors: ["The Coq development team, INRIA, CNRS, and contributors"]
license: "LGPL-2.1-only"
homepage: "https://coq.inria.fr/"
doc: "https://coq.github.io/doc/"
bug-reports: "https://github.com/coq/coq/issues"
depends: [
"dune" {>= "3.6.1" & < "3.14"}
"ocaml" {>= "4.09.0"}
"ocamlfind" {>= "1.8.1"}
"zarith" {>= "1.11"}
"conf-linux-libc-dev" {os = "linux"}
"odoc" {with-doc}
]
conflicts: [
"coq" { < "8.17" }
]
depopts: ["coq-native" "memprof-limits" "memtrace"]
dev-repo: "git+https://github.com/coq/coq.git"
build: [
["dune" "subst"] {dev}
[ "./configure"
"-prefix" prefix
"-mandir" man
"-libdir" "%{lib}%/coq"
"-native-compiler" "yes" {coq-native:installed} "no" {!coq-native:installed}
]
[
"dune"
"build"
"-p"
name
"-j"
jobs
"--promote-install-files=false"
"@install"
"@runtest" {with-test}
"@doc" {with-doc}
]
["dune" "install" "-p" name "--create-install-files" name]
]

url {
src: "git+https://github.com/coq/coq.git#v8.20"
}
2 changes: 1 addition & 1 deletion core-dev/packages/coq-core/coq-core.dev/opam
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ homepage: "https://coq.inria.fr/"
doc: "https://coq.github.io/doc/"
bug-reports: "https://github.com/coq/coq/issues"
depends: [
"dune" {>= "2.9"}
"dune" {>= "2.9" & < "3.14"}
"ocaml" {>= "4.09.0"}
"ocamlfind" {>= "1.8.1"}
"zarith" {>= "1.11"}
Expand Down
55 changes: 55 additions & 0 deletions core-dev/packages/coq-stdlib/coq-stdlib.8.20+rc1/opam
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
opam-version: "2.0"
synopsis: "The Coq Proof Assistant -- Standard Library"
description: """
Coq is a formal proof management system. It provides
a formal language to write mathematical definitions, executable
algorithms and theorems together with an environment for
semi-interactive development of machine-checked proofs.

Typical applications include the certification of properties of
programming languages (e.g. the CompCert compiler certification
project, or the Bedrock verified low-level programming library), the
formalization of mathematics (e.g. the full formalization of the
Feit-Thompson theorem or homotopy type theory) and teaching.

This package includes the Coq Standard Library, that is to say, the
set of modules usually bound to the Coq.* namespace."""
maintainer: ["The Coq development team <[email protected]>"]
authors: ["The Coq development team, INRIA, CNRS, and contributors"]
license: "LGPL-2.1-only"
homepage: "https://coq.inria.fr/"
doc: "https://coq.github.io/doc/"
bug-reports: "https://github.com/coq/coq/issues"
depends: [
"dune" {>= "3.6"}
"coq-core" {= version}
"odoc" {with-doc}
]
depopts: ["coq-native"]
dev-repo: "git+https://github.com/coq/coq.git"
build: [
["dune" "subst"] {dev}
# We tell dunestrap to use coq-config from coq-core
[ make "dunestrap" "COQ_DUNE_EXTRA_OPT=-split" "DUNESTRAPOPT=-p coq-stdlib"]
[
"dune"
"build"
"-p"
name
"-j"
jobs
"--promote-install-files=false"
"@install"
"@runtest" {with-test}
"@doc" {with-doc}
]
["dune" "install" "-p" name "--create-install-files" name]
]
url {
src:
"https://github.com/coq/coq/releases/download/V8.20+rc1/coq-8.20-rc1.tar.gz"
checksum: [
"md5=3a50a9d2768cf5dd0190afbd81f97051"
"sha512=895730028bb00a6b0c71d2b3fdff6d215f6bcc40a8223b20f7e1ce15a6cea0b3ca2243babeeac39653db887ae0147f98fb9e808d1b1b9b9e26baf2bc849c82ab"
]
}
51 changes: 51 additions & 0 deletions core-dev/packages/coq-stdlib/coq-stdlib.8.20.dev/opam
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
opam-version: "2.0"
synopsis: "The Coq Proof Assistant -- Standard Library"
description: """
Coq is a formal proof management system. It provides
a formal language to write mathematical definitions, executable
algorithms and theorems together with an environment for
semi-interactive development of machine-checked proofs.

Typical applications include the certification of properties of
programming languages (e.g. the CompCert compiler certification
project, or the Bedrock verified low-level programming library), the
formalization of mathematics (e.g. the full formalization of the
Feit-Thompson theorem or homotopy type theory) and teaching.

This package includes the Coq Standard Library, that is to say, the
set of modules usually bound to the Coq.* namespace."""
maintainer: ["The Coq development team <[email protected]>"]
authors: ["The Coq development team, INRIA, CNRS, and contributors"]
license: "LGPL-2.1-only"
homepage: "https://coq.inria.fr/"
doc: "https://coq.github.io/doc/"
bug-reports: "https://github.com/coq/coq/issues"
depends: [
"dune" {>= "3.6"}
"coq-core" {= version}
"odoc" {with-doc}
]
depopts: ["coq-native"]
dev-repo: "git+https://github.com/coq/coq.git"
build: [
["dune" "subst"] {dev}
# We tell dunestrap to use coq-config from coq-core
[ make "dunestrap" "COQ_DUNE_EXTRA_OPT=-split" "DUNESTRAPOPT=-p coq-stdlib"]
[
"dune"
"build"
"-p"
name
"-j"
jobs
"--promote-install-files=false"
"@install"
"@runtest" {with-test}
"@doc" {with-doc}
]
["dune" "install" "-p" name "--create-install-files" name]
]

url {
src: "git+https://github.com/coq/coq.git#v8.20"
}
2 changes: 1 addition & 1 deletion core-dev/packages/coq-stdlib/coq-stdlib.dev/opam
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ dev-repo: "git+https://github.com/coq/coq.git"
build: [
["dune" "subst"] {dev}
# We tell dunestrap to use coq-config from coq-core
[ make "dunestrap" "COQ_DUNE_EXTRA_OPT=-split" "DUNESTRAPOPT=-p coq-stdlib"]
[ make "dunestrap" "COQ_SPLIT=1" "DUNESTRAPOPT=-p coq-stdlib"]
[
"dune"
"build"
Expand Down
60 changes: 60 additions & 0 deletions core-dev/packages/coq/coq.8.20+rc1/opam
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
opam-version: "2.0"
synopsis: "The Coq Proof Assistant"
description: """
Coq is a formal proof management system. It provides
a formal language to write mathematical definitions, executable
algorithms and theorems together with an environment for
semi-interactive development of machine-checked proofs.

Typical applications include the certification of properties of
programming languages (e.g. the CompCert compiler certification
project, or the Bedrock verified low-level programming library), the
formalization of mathematics (e.g. the full formalization of the
Feit-Thompson theorem or homotopy type theory) and teaching."""
maintainer: ["The Coq development team <[email protected]>"]
authors: ["The Coq development team, INRIA, CNRS, and contributors"]
license: "LGPL-2.1-only"
homepage: "https://coq.inria.fr/"
doc: "https://coq.github.io/doc/"
bug-reports: "https://github.com/coq/coq/issues"
depends: [
"dune" {>= "3.6"}
"coq-core" {= version}
"coq-stdlib" {= version}
"coqide-server" {= version}
"ounit2" {with-test}
"conf-python-3" {with-test}
"conf-time" {with-test}
"odoc" {with-doc}
]
dev-repo: "git+https://github.com/coq/coq.git"
build: [
["dune" "subst"] {dev}
[ "./configure"
"-prefix" prefix
"-mandir" man
"-libdir" "%{lib}%/coq"
"-native-compiler" "yes" {coq-native:installed} "no" {!coq-native:installed}
] {with-test}
[
"dune"
"build"
"-p"
name
"-j"
jobs
"--promote-install-files=false"
"@install"
"@runtest" {with-test}
"@doc" {with-doc}
]
["dune" "install" "-p" name "--create-install-files" name]
]
url {
src:
"https://github.com/coq/coq/releases/download/V8.20+rc1/coq-8.20-rc1.tar.gz"
checksum: [
"md5=3a50a9d2768cf5dd0190afbd81f97051"
"sha512=895730028bb00a6b0c71d2b3fdff6d215f6bcc40a8223b20f7e1ce15a6cea0b3ca2243babeeac39653db887ae0147f98fb9e808d1b1b9b9e26baf2bc849c82ab"
]
}
Loading

0 comments on commit 077dc6b

Please sign in to comment.