From 5643e656b989aca7629723653a2570c7df6252b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20Mart=C3=ADnez?= Date: Thu, 5 Sep 2024 10:23:45 -0700 Subject: [PATCH] Bumping everything to OCaml 4.14.0 --- .devcontainer/minimal.Dockerfile | 2 +- .docker/opam.Dockerfile | 2 +- .docker/package.Dockerfile | 2 +- .docker/release.Dockerfile | 2 +- .github/setup-macos.sh | 2 +- INSTALL.md | 4 ++-- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.devcontainer/minimal.Dockerfile b/.devcontainer/minimal.Dockerfile index a7dba2c52a9..bab557a854b 100644 --- a/.devcontainer/minimal.Dockerfile +++ b/.devcontainer/minimal.Dockerfile @@ -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 diff --git a/.docker/opam.Dockerfile b/.docker/opam.Dockerfile index 354159f9731..318ebb576df 100644 --- a/.docker/opam.Dockerfile +++ b/.docker/opam.Dockerfile @@ -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 diff --git a/.docker/package.Dockerfile b/.docker/package.Dockerfile index efb429159af..7087f2e0e8c 100644 --- a/.docker/package.Dockerfile +++ b/.docker/package.Dockerfile @@ -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 diff --git a/.docker/release.Dockerfile b/.docker/release.Dockerfile index 2cb9f4d9d64..f65adb03ef2 100644 --- a/.docker/release.Dockerfile +++ b/.docker/release.Dockerfile @@ -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 diff --git a/.github/setup-macos.sh b/.github/setup-macos.sh index 13b60edbd7f..fd031b5fc5f 100755 --- a/.github/setup-macos.sh +++ b/.github/setup-macos.sh @@ -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 diff --git a/INSTALL.md b/INSTALL.md index 91107b77ab8..e7d55c3ef92 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -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 @@ -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,