Merge branch 'release/v1.1.1' into opam-install-ci

CHANGELOG.md

@@ -2,6 +2,7 @@
 * Added lower bounds to dependencies (zarith, ocaml-monadic, sha, conf-gmp).
 * Fixed ounit2 library for unit tests.
 * Disabled kernel regression tests when linux-headers couldn't be downloaded (e.g. in opam-repository opam-ci).
+* Fixed dune-site in opam install by requiring dune 2.9.1.
 
 ## v1.1.0
 

dune-project

@@ -1,4 +1,5 @@
-(lang dune 2.8)
+(lang dune 2.9)
+; need 2.9 for dune-site to work with opam install: https://github.com/ocaml/dune/issues/4212, https://github.com/ocaml/dune/pull/4645, https://github.com/ocaml/dune/pull/4774
 (using dune_site 0.1)
 (name goblint)
 ; build failed with: Files src/.maingoblint.eobjs/native/mutex.cmx and _opam/lib/ocaml/threads/threads.cmxa both define a module named Mutex
@@ -23,7 +24,7 @@
   (synopsis "Static analysis framework for C")
   (depends
     (ocaml (>= 4.09))
-    dune
+    (dune (>= 2.9.1)) ; explicit lower bound needed for opam install (https://github.com/ocaml/dune/pull/4806), (lang dune 2.9.1) doesn't do this
     (goblint-cil (>= 1.8.2)) ; 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.2.0))
     (zarith (>= 1.8))

goblint.opam

@@ -20,7 +20,7 @@ doc: "https://goblint.readthedocs.io/en/latest/"
 bug-reports: "https://github.com/goblint/analyzer/issues"
 depends: [
   "ocaml" {>= "4.09"}
-  "dune" {>= "2.8"}
+  "dune" {>= "2.9.1"}
   "goblint-cil" {>= "1.8.2"}
   "batteries" {>= "3.2.0"}
   "zarith" {>= "1.8"}
@@ -47,10 +47,12 @@ build: [
     name
     "-j"
     jobs
+    "--promote-install-files=false"
     "@install"
     "@runtest" {with-test}
     "@doc" {with-doc}
   ]
+  ["dune" "install" "-p" name "--create-install-files" name]
 ]
 dev-repo: "git+https://github.com/goblint/analyzer.git"
 # on `dune build` goblint.opam will be generated from goblint.opam.template and dune-project

goblint.opam.locked

@@ -34,7 +34,7 @@ depends: [
   "conf-perl" {= "1"}
   "conf-ruby" {= "1.0.0" & with-test}
   "cppo" {= "1.6.7"}
-  "dune" {= "2.9.0"}
+  "dune" {= "2.9.1"}
   "dune-private-libs" {= "2.9.1"}
   "dune-site" {= "2.9.1"}
   "easy-format" {= "1.3.2"}
@@ -74,16 +74,18 @@ depends: [
 build: [
   ["dune" "subst"] {dev}
   [
-    "dune"
-    "build"
-    "-p"
-    name
-    "-j"
-    jobs
-    "@install"
-    "@runtest" {with-test}
-    "@doc" {with-doc}
-  ]
+  "dune"
+  "build"
+  "-p"
+  name
+  "-j"
+  jobs
+  "--promote-install-files=false"
+  "@install"
+  "@runtest" {with-test}
+  "@doc" {with-doc}
+]
+  ["dune" "install" "-p" name "--create-install-files" name]
 ]
 dev-repo: "git+https://github.com/goblint/analyzer.git"
 name: "goblint"