Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into nik_binary_search
Browse files Browse the repository at this point in the history
  • Loading branch information
nikswamy committed Sep 8, 2024
2 parents efb448f + aff57d4 commit 1d9a8fb
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .devcontainer/fromscratch/minimal.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
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 make
opam init --compiler=4.12.0
opam init --compiler=4.14.0
eval $(opam env)

# Install Z3 and the opam package dependencies
Expand Down
2 changes: 1 addition & 1 deletion src/ci/ci.Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/ci/no-fstar-home.Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/ci/opam.Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/ci/package.Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down

0 comments on commit 1d9a8fb

Please sign in to comment.