From 5f9ed809e1afdb51c80ff1c404edeca558ab42cc Mon Sep 17 00:00:00 2001 From: Simmo Saan Date: Tue, 7 May 2024 15:22:21 +0300 Subject: [PATCH 1/2] Bump OCaml lower bound to 4.14 --- dune-project | 2 +- goblint.opam | 2 +- gobview | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dune-project b/dune-project index 9f5d5b194a..878abd3b4f 100644 --- a/dune-project +++ b/dune-project @@ -23,7 +23,7 @@ (name goblint) (synopsis "Static analysis framework for C") (depends - (ocaml (>= 4.10)) + (ocaml (>= 4.14)) (goblint-cil (>= 2.0.3)) ; TODO no way to define as pin-depends? Used goblint.opam.template to add it for now. https://github.com/ocaml/dune/issues/3231. Alternatively, removing this line and adding cil as a git submodule and `(vendored_dirs cil)` as ./dune also works. This way, no more need to reinstall the pinned cil opam package on changes. However, then cil is cleaned and has to be rebuild together with goblint. (batteries (>= 3.5.1)) (zarith (>= 1.10)) diff --git a/goblint.opam b/goblint.opam index c8c4ce4e59..692625c965 100644 --- a/goblint.opam +++ b/goblint.opam @@ -21,7 +21,7 @@ doc: "https://goblint.readthedocs.io/en/latest/" bug-reports: "https://github.com/goblint/analyzer/issues" depends: [ "dune" {>= "3.7"} - "ocaml" {>= "4.10"} + "ocaml" {>= "4.14"} "goblint-cil" {>= "2.0.3"} "batteries" {>= "3.5.1"} "zarith" {>= "1.10"} diff --git a/gobview b/gobview index 456944fa5d..72abbb576b 160000 --- a/gobview +++ b/gobview @@ -1 +1 @@ -Subproject commit 456944fa5d9253ef55c4eb2a20936819708b3710 +Subproject commit 72abbb576b8ffc8759dcfa31501738f6b561b05a From ca23154bed2133e1c559f68b2b520dafd31427bd Mon Sep 17 00:00:00 2001 From: Simmo Saan Date: Tue, 7 May 2024 15:22:56 +0300 Subject: [PATCH 2/2] Remove old OCaml versions from unlocked CI --- .github/workflows/unlocked.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/unlocked.yml b/.github/workflows/unlocked.yml index 5e586ee038..e6e65604bc 100644 --- a/.github/workflows/unlocked.yml +++ b/.github/workflows/unlocked.yml @@ -21,9 +21,6 @@ jobs: - 5.0.x - ocaml-variants.4.14.0+options,ocaml-option-flambda - 4.14.x - - 4.13.x - - 4.12.x - - 4.10.x apron: - false - true