Merge branch 'dev' into haz3l-properties

.github/workflows/deploy_branches.yml

@@ -26,7 +26,7 @@ jobs:
         run: |
           sudo apt --assume-yes install curl m4 opam
           export OPAMYES=1
-          opam init --compiler=ocaml-base-compiler.5.0.0
+          opam init --compiler=ocaml-base-compiler.5.2.0
       - name: Install dependencies
         run: |
           eval $(opam env)

INSTALL.md

@@ -119,16 +119,16 @@ follow these instructions instead of the shorter instructions in the
   opam update
   ```
 
-- Install OCaml 5.0.0 (some older versions may also work; see the
+- Install OCaml 5.2.0 (some older versions may also work; see the
   ["Current version" section of `Updating.md`](docs/Updating-OCaml-Version.md) for
   why we may not use the newest version of OCaml).
 
   ```sh
-   opam switch create 5.0.0 ocaml-base-compiler.5.0.0
+   opam switch create 5.2.0 ocaml-base-compiler.5.2.0
   ```
 - Update the current switch environment
   ```sh
-  eval $(opam env --switch=5.0.0)
+  eval $(opam env --switch=5.2.0)
   ```
 ## Clone the Source Code
 

Makefile

@@ -12,6 +12,7 @@ deps:
 
 change-deps:
 	opam switch export opam.export
+	sed -i '' '/host-/d' opam.export # remove host- lines which are arch-specific
 
 setup-instructor:
 	cp src/haz3lweb/ExerciseSettings_instructor.re src/haz3lweb/ExerciseSettings.re

README.md

@@ -17,7 +17,7 @@ can also be accessed at:
 
 ### Short version
 
-If you already have `ocaml` version 5.0.0 and least version 2.0 of `opam`
+If you already have `ocaml` version 5.2.0 and at least version 2.0 of `opam`
 installed, you can build Hazel by running the following commands.
 
 - `git clone [email protected]:hazelgrove/hazel.git`
@@ -155,7 +155,7 @@ To obtain an clean build, you may need to:
 
   ```sh
   # opam switch remove ./
-  opam switch create ./ 5.0.0
+  opam switch create ./ 5.2.0
   eval $(opam env)
   make deps
   make
@@ -205,3 +205,12 @@ that will build that branch (in `release` mode) and deploy it to the URL
 It usually takes about 2 minutes if the build environment cache hits, or 
 20+ minutes if not. You can view the status of the build in the [Actions 
 tab on Github](https://github.com/hazelgrove/hazel/actions).
+
+Builds prior to July 2024 are archived at `https://hazel.org/build/<branch name>`.
+
+Note: If another archive needs to be performed, make sure to redeploy the following
+branches manually since we refer to them in various public material (websites and
+published papers):
+
+  dev
+  livelits

docs/Updating-OCaml-Version.md

@@ -2,7 +2,7 @@
 
 ## Current version
 
-The most recent version that we use is Ocaml 5.0.0.
+The most recent version that we use is Ocaml 5.2.0.
 If there are known issues with more recent version of OCaml, we will list them here.
 
 ## How to update Hazel to use a new version of ocaml
@@ -16,15 +16,15 @@ To update do the following:
 - `opam switch list-available`
 
 - Choose the most recent version, but no later than the public release on 
-  ocaml.org (e.g., `5.0.0`).
+  ocaml.org (e.g., `5.2.0`).
 
 - Create a new branch called `update_ocaml_VERSION` where VERSION is the 
   version of OCaml you intend to upgrade to. 
 
     `git checkout -b update_ocaml_VERSION`
 
 - `opam switch create VERSION`, where `VERSION` is the most recent OCaml version
-  that does not contain a `+` character (e.g., `4.12.1`).
+  that does not contain a `+` character (e.g., `5.2.0`).
 
 - `make deps`
 
@@ -59,10 +59,23 @@ To update do the following:
       
       - Merge your branch with either `dev` or `update_ocaml_VERSION` if that is tricky.
 
-      - Update your OCaml installation by running the following:
+      - Update your `opam`.
 
         ```
         opam update
+        ```
+
+        If you get the following warning:
+
+        ```
+        [WARNING] opam is out-of-date. Please consider updating it (https://opam.ocaml.org/doc/Install.html)
+        ```
+
+        You may want to update opam by following the instructions for your platform at that link.
+
+      - Update your OCaml installation by running the following:
+
+        ```
         opam switch create VERSION
         eval $(opam env)
         make deps

dune-project

@@ -1,2 +1,2 @@
-(lang dune 3.0)
+(lang dune 3.16)
 (using menhir 2.0)