From b9027a9d61b07fc37f13cb77265fe764fdbeeef7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20Mart=C3=ADnez?= Date: Sun, 8 Sep 2024 12:35:10 -0700 Subject: [PATCH] Bump to OCaml 4.14 --- .devcontainer/fromscratch/minimal.Dockerfile | 2 +- .github/setup-macos.sh | 2 +- src/ci/ci.Dockerfile | 2 +- src/ci/no-fstar-home.Dockerfile | 2 +- src/ci/opam.Dockerfile | 2 +- src/ci/package.Dockerfile | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.devcontainer/fromscratch/minimal.Dockerfile b/.devcontainer/fromscratch/minimal.Dockerfile index 99493330d..90d828fa9 100644 --- a/.devcontainer/fromscratch/minimal.Dockerfile +++ b/.devcontainer/fromscratch/minimal.Dockerfile @@ -39,7 +39,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.1 +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 index 9e72f6118..c74c69b07 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 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/src/ci/ci.Dockerfile b/src/ci/ci.Dockerfile index 4125d34e1..fd145dfda 100644 --- a/src/ci/ci.Dockerfile +++ b/src/ci/ci.Dockerfile @@ -1,6 +1,6 @@ # This Dockerfile should be run from the root Pulse 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 index 47336a36c..1c10af1a7 100644 --- 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 Pulse 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 index 882cfac28..8610142c0 100644 --- a/src/ci/opam.Dockerfile +++ b/src/ci/opam.Dockerfile @@ -1,6 +1,6 @@ # This Dockerfile should be run from the root Pulse 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 index ef89f6318..8d20a356c 100644 --- a/src/ci/package.Dockerfile +++ b/src/ci/package.Dockerfile @@ -1,6 +1,6 @@ # This Dockerfile should be run from the root Pulse 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