Merge branch 'main' into afromher_misc

FStarLang · Oct 21, 2024 · 48d4b34 · 48d4b34
2 parents 1716371 + afbf599
commit 48d4b34
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 7 deletions.
diff --git a/.devcontainer/minimal.Dockerfile b/.devcontainer/minimal.Dockerfile
@@ -37,7 +37,7 @@ RUN mkdir -p $HOME/bin
 RUN echo 'export PATH=$HOME/bin:$PATH' | tee --append $HOME/.profile $HOME/.bashrc $HOME/.bash_profile
 
 # 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/.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 make
-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/share/steel/examples/steel/README_icfp21.md b/share/steel/examples/steel/README_icfp21.md
@@ -16,7 +16,7 @@ If you are using the provided VM, F\* is already installed and this section can
 
 Setting up a local environment requires a working OCaml setup with OPAM.
 Installation instructions for OPAM are available [here](http://opam.ocaml.org/doc/Install.html).
-OCaml version from 4.04.0 to 4.12.X should work.
+OCaml version 4.14.0 and onwards should work.
 
 F\* depends on a bunch of external packages which you should install using OPAM:
 

diff --git a/src/ci/ci.Dockerfile b/src/ci/ci.Dockerfile
@@ -1,6 +1,6 @@
 # This Dockerfile should be run from the root Steel directory
 
-ARG ocaml_version=4.12
+ARG ocaml_version=4.14
 FROM ocaml/opam:ubuntu-22.04-ocaml-$ocaml_version
 
 # CI dependencies for the Wasm11 test: node.js

diff --git a/src/ci/no-fstar-home.Dockerfile b/src/ci/no-fstar-home.Dockerfile
@@ -1,6 +1,6 @@
 # This Dockerfile should be run from the root Steel directory
 
-ARG ocaml_version=4.12
+ARG ocaml_version=4.14
 FROM ocaml/opam:ubuntu-22.04-ocaml-$ocaml_version
 
 ARG opamthreads=24

diff --git a/src/ci/opam.Dockerfile b/src/ci/opam.Dockerfile
@@ -1,6 +1,6 @@
 # This Dockerfile should be run from the root Steel directory
 
-ARG ocaml_version=4.12
+ARG ocaml_version=4.14
 FROM ocaml/opam:ubuntu-22.04-ocaml-$ocaml_version
 
 ARG opamthreads=24

diff --git a/src/ci/package.Dockerfile b/src/ci/package.Dockerfile
@@ -1,6 +1,6 @@
 # This Dockerfile should be run from the root Steel directory
 
-ARG ocaml_version=4.12
+ARG ocaml_version=4.14
 FROM ocaml/opam:ubuntu-20.04-ocaml-$ocaml_version
 
 # CI dependencies for the Wasm11 test: node.js