Skip to content

Commit

Permalink
Bumping everything to OCaml 4.14.0
Browse files Browse the repository at this point in the history
  • Loading branch information
mtzguido committed Sep 5, 2024
1 parent 1e73a3a commit 5643e65
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .devcontainer/minimal.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ RUN wget -nv https://download.visualstudio.microsoft.com/download/pr/cd0d0a4d-2a
rm -f dotnet-sdk*.tar.gz

# Install OCaml
ARG OCAML_VERSION=4.12.0
ARG OCAML_VERSION=4.14.0
RUN opam init --compiler=$OCAML_VERSION --disable-sandboxing
RUN opam option depext-run-installs=true
ENV OPAMYES=1
Expand Down
2 changes: 1 addition & 1 deletion .docker/opam.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# This Dockerfile should be run from the root FStar directory

ARG ocaml_version=4.12
ARG ocaml_version=4.14
FROM ocaml/opam:ubuntu-ocaml-$ocaml_version

# FIXME: the `opam depext` command should be unnecessary with opam 2.1
Expand Down
2 changes: 1 addition & 1 deletion .docker/package.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# This Dockerfile should be run from the root FStar directory

# Build the package
ARG ocaml_version=4.12
ARG ocaml_version=4.14
ARG CI_THREADS=24

FROM ocaml/opam:ubuntu-20.04-ocaml-$ocaml_version AS fstarbuild
Expand Down
2 changes: 1 addition & 1 deletion .docker/release.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# This Dockerfile should be run from the root FStar directory

# Build the package
ARG ocaml_version=4.12
ARG ocaml_version=4.14
ARG CI_THREADS=24

FROM ocaml/opam:ubuntu-20.04-ocaml-$ocaml_version AS fstarbuild
Expand Down
2 changes: 1 addition & 1 deletion .github/setup-macos.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# coreutils: for the `install` command used in install-ulib.sh
export OPAMYES=1
brew install opam bash gnu-getopt coreutils gnu-sed
opam init --compiler=4.12.0
opam init --compiler=4.14.0
eval $(opam env)

# Install Z3 and the opam package dependencies
Expand Down
4 changes: 2 additions & 2 deletions INSTALL.md
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ need to perform the following step before your first use:
$ fstar.exe --version
F* 0.9.8.0~dev
platform=Linux_x86_64
compiler=OCaml 4.12.0
compiler=OCaml 4.14.0
date=yyyy-mm-ddThh:nn:ss+02:00
commit=xxxxxxxx
$ z3 --version
Expand Down Expand Up @@ -209,7 +209,7 @@ The steps require a working OCaml setup. OCaml version 4.14.X should work.
```sh
$ opam update
$ opam switch list-available
$ opam switch create ocaml-variants.4.12.0+mingw64c
$ opam switch create ocaml-variants.4.14.0+mingw64c
```

3. Afterwards you can install the `depext` and `depext-cygwinports` packages,
Expand Down

0 comments on commit 5643e65

Please sign in to comment.