Skip to content

Commit b4d1e38

Browse files
committed
Replace goblint-cil pin with published 2.0.7
1 parent a79ffc2 commit b4d1e38

File tree

4 files changed

+6
-8
lines changed

4 files changed

+6
-8
lines changed

dune-project

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ Goblint includes analyses for assertions, overflows, deadlocks, etc and can be e
3737
"concurrency"))
3838
(depends
3939
(ocaml (>= 4.14))
40-
(goblint-cil (>= 2.0.5)) ; 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.
40+
(goblint-cil (>= 2.0.7)) ; 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.
4141
(batteries (>= 3.9.0))
4242
(zarith (>= 1.10))
4343
(yojson (and (>= 2.0.0) (< 3))) ; json-data-encoding has incompatible yojson representation for yojson 3

goblint.opam

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ bug-reports: "https://github.com/goblint/analyzer/issues"
3737
depends: [
3838
"dune" {>= "3.13"}
3939
"ocaml" {>= "4.14"}
40-
"goblint-cil" {>= "2.0.5"}
40+
"goblint-cil" {>= "2.0.7"}
4141
"batteries" {>= "3.9.0"}
4242
"zarith" {>= "1.10"}
4343
"yojson" {>= "2.0.0" & < "3"}
@@ -101,7 +101,8 @@ dev-repo: "git+https://github.com/goblint/analyzer.git"
101101
# also remember to generate/adjust goblint.opam.locked!
102102
available: os-family != "bsd" & os-distribution != "alpine" & (arch != "arm64" | os = "macos")
103103
pin-depends: [
104-
[ "goblint-cil.2.0.7" "git+https://github.com/goblint/cil.git#8e2212316ceda6911de2db716933bfb8c64a8585" ]
104+
# published goblint-cil 2.0.7 is currently up-to-date, so no pin needed
105+
# [ "goblint-cil.2.0.7" "git+https://github.com/goblint/cil.git#8e2212316ceda6911de2db716933bfb8c64a8585" ]
105106
# pinned for stability (https://github.com/goblint/analyzer/issues/1520), remove after new apron release
106107
[ "apron.v0.9.15" "git+https://github.com/antoinemine/apron.git#418a217c7a70dae3f422678f3aaba38ae374d91a" ]
107108
]

goblint.opam.locked

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -141,10 +141,6 @@ post-messages: [
141141
"Do not benchmark Goblint on OCaml 5 (https://goblint.readthedocs.io/en/latest/user-guide/benchmarking/)." {ocaml:version >= "5.0.0"}
142142
]
143143
pin-depends: [
144-
[
145-
"goblint-cil.2.0.7"
146-
"git+https://github.com/goblint/cil.git#8e2212316ceda6911de2db716933bfb8c64a8585"
147-
]
148144
[
149145
"apron.v0.9.15"
150146
"git+https://github.com/antoinemine/apron.git#418a217c7a70dae3f422678f3aaba38ae374d91a"

goblint.opam.template

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
# also remember to generate/adjust goblint.opam.locked!
33
available: os-family != "bsd" & os-distribution != "alpine" & (arch != "arm64" | os = "macos")
44
pin-depends: [
5-
[ "goblint-cil.2.0.7" "git+https://github.com/goblint/cil.git#8e2212316ceda6911de2db716933bfb8c64a8585" ]
5+
# published goblint-cil 2.0.7 is currently up-to-date, so no pin needed
6+
# [ "goblint-cil.2.0.7" "git+https://github.com/goblint/cil.git#8e2212316ceda6911de2db716933bfb8c64a8585" ]
67
# pinned for stability (https://github.com/goblint/analyzer/issues/1520), remove after new apron release
78
[ "apron.v0.9.15" "git+https://github.com/antoinemine/apron.git#418a217c7a70dae3f422678f3aaba38ae374d91a" ]
89
]

0 commit comments

Comments
 (0)