From bf1d45193b0ac17280578534c2922d586441a2d0 Mon Sep 17 00:00:00 2001 From: Nicholas Coughlin Date: Tue, 19 Mar 2024 08:08:23 +1000 Subject: [PATCH 1/2] Ocaml version to 4.14 --- README.md | 2 +- asli.opam | 2 +- dune-project | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index b6a354d8..8404ec7c 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ describing how to use ASLi with Arm's v8.6-A ISA specification. To build and run the ASL interpreter, you will need: - * OCaml version 4.09 or later + * OCaml version 4.14 or later * OPAM OCaml version 2.0.5 (other versions may work) * The following OPAM packages * ocaml - OCaml compiler diff --git a/asli.opam b/asli.opam index c458f186..690da900 100644 --- a/asli.opam +++ b/asli.opam @@ -17,7 +17,7 @@ homepage: "https://github.com/alastairreid/asl-interpreter" bug-reports: "https://github.com/alastairreid/asl-interpreter/issues" depends: [ "dune" {>= "2.8"} - "ocaml" {>= "4.09"} + "ocaml" {>= "4.14"} "menhir" {build} "ott" {build & >= "0.31"} "linenoise" diff --git a/dune-project b/dune-project index 4d64e0c8..6b9b8780 100644 --- a/dune-project +++ b/dune-project @@ -16,7 +16,7 @@ "\| loading ELF files and executing Arm binaries. ) (depends - ("ocaml" (>= "4.09")) + ("ocaml" (>= "4.14")) ("menhir" :build) ("ott" (and :build (>= "0.31"))) "linenoise" From d43bc68b47750d4366cadbbccacd164e1a5f954c Mon Sep 17 00:00:00 2001 From: Nicholas Coughlin Date: Tue, 19 Mar 2024 08:24:43 +1000 Subject: [PATCH 2/2] Fix more references to OCaml 4.09 --- .github/workflows/opam.yml | 2 +- Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/opam.yml b/.github/workflows/opam.yml index e7df55b3..c0298aef 100644 --- a/.github/workflows/opam.yml +++ b/.github/workflows/opam.yml @@ -21,7 +21,7 @@ jobs: - uses: actions/checkout@v4 - uses: ocaml/setup-ocaml@v2 with: - ocaml-compiler: 4.09 + ocaml-compiler: 4.14 - run: opam install dune - run: opam install . --deps-only --with-test - run: opam exec -- dune build --profile release diff --git a/Dockerfile b/Dockerfile index bcbb09a3..8718c33e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ocaml/opam:ubuntu-20.04-ocaml-4.09 +FROM ocaml/opam:ubuntu-20.04-ocaml-4.14 # Install system dependencies USER root