Skip to content
This repository has been archived by the owner on Sep 7, 2023. It is now read-only.

Commit

Permalink
chore(dep) Upgrade to Q*cert 2.1.0 for Coq 11/12 with native floats
Browse files Browse the repository at this point in the history
Signed-off-by: Jerome Simeon <[email protected]>
  • Loading branch information
jeromesimeon committed Aug 24, 2020
1 parent c412b57 commit 1a11e14
Show file tree
Hide file tree
Showing 8 changed files with 34,169 additions and 25,024 deletions.
14 changes: 13 additions & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ common_steps: &common_steps
- run:
name: "Initialize opam"
command: |
echo "OCaml: " $OCAML_VERSION
sudo curl -sL https://raw.githubusercontent.com/ocaml/opam/master/shell/install.sh > install.sh
echo | sudo sh install.sh
opam init --disable-sandboxing -j 1 -n -y
Expand All @@ -43,7 +44,7 @@ common_steps: &common_steps
- run:
name: "Install Coq"
command: |
opam install -y -v coq.8.12.0 coq-flocq coq-jsast
opam install -y -v coq.8.12.0 coq-jsast.2.0.0
no_output_timeout: 30m
- run:
name: "Install Q*cert"
Expand Down Expand Up @@ -83,9 +84,20 @@ jobs:
- NJOBS: 2
- NPM_CONFIG_PREFIX: "~/.npm-global"
<<: *common_steps
4.11.0:
docker:
- image: circleci/openjdk:8-jdk
environment:
- TERM: dumb
- OCAML_VERSION: "4.11.0"
- CIRCLE_TEST_REPORTS: /tmp/circleci-test-results
- NJOBS: 2
- NPM_CONFIG_PREFIX: "~/.npm-global"
<<: *common_steps

workflows:
version: 2
build-deploy:
jobs:
- 4.09.1
- 4.11.0
8 changes: 4 additions & 4 deletions DEVELOPERS.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@ Before you can build Ergo, you must install and configure the following prerequi
$ npm install -g lerna@^3.15.0
```

* [opam](https://opam.ocaml.org): the OCaml package manager, for OCaml 4.09.1. To install:
* [opam](https://opam.ocaml.org): the OCaml package manager, for OCaml 4.11.0. To install:

```sh
$ sh <(curl -sL https://raw.githubusercontent.com/ocaml/opam/master/shell/install.sh)
$ eval $(opam env)
$ opam switch create 4.09.1
$ opam switch create 4.11.0
```

#### Install development version
Expand All @@ -49,12 +49,12 @@ $ npm install -g

##### Dependencies

To rebuild the compiler from the source, you will need Coq 8.8.2 and OCaml 4.07.1 with some additional libraries. You can add the necessary libraries with opam as follow:
To rebuild the compiler from the source, you will need Coq 8.12.0 and OCaml 4.11.0 with some additional libraries. You can add the necessary libraries with opam as follow:

```sh
$ opam repo add coq-released https://coq.inria.fr/opam/released
$ opam install dune menhir base64 js_of_ocaml js_of_ocaml-ppx yojson atdgen re calendar uri
$ opam install coq.8.8.2 coq-qcert.2.0.0
$ opam install coq.8.12.0 coq-qcert.2.1.0
```

##### Build the Ergo Compiler and REPL
Expand Down
2 changes: 1 addition & 1 deletion Makefile.config
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@
#

## Qcert compiler location
QCERT=../qcert-master
#QCERT=../qcert-master
Loading

0 comments on commit 1a11e14

Please sign in to comment.