Skip to content

Commit ade7968

Browse files
committed
Replace goblint-cil pin with published 2.0.3
1 parent 07463bf commit ade7968

File tree

5 files changed

+8
-10
lines changed

5 files changed

+8
-10
lines changed

dune-project

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
(synopsis "Static analysis framework for C")
2525
(depends
2626
(ocaml (>= 4.10))
27-
(goblint-cil (>= 2.0.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.
27+
(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.
2828
(batteries (>= 3.5.0))
2929
(zarith (>= 1.8))
3030
(yojson (>= 2.0.0))

goblint.opam

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ bug-reports: "https://github.com/goblint/analyzer/issues"
2121
depends: [
2222
"dune" {>= "3.7"}
2323
"ocaml" {>= "4.10"}
24-
"goblint-cil" {>= "2.0.2"}
24+
"goblint-cil" {>= "2.0.3"}
2525
"batteries" {>= "3.5.0"}
2626
"zarith" {>= "1.8"}
2727
"yojson" {>= "2.0.0"}
@@ -75,7 +75,8 @@ dev-repo: "git+https://github.com/goblint/analyzer.git"
7575
# also remember to generate/adjust goblint.opam.locked!
7676
available: os-distribution != "alpine" & arch != "arm64"
7777
pin-depends: [
78-
[ "goblint-cil.2.0.2" "git+https://github.com/goblint/cil.git#c7ffc37ad83216a84d90fdbf427cc02a68ea5331" ]
78+
# published goblint-cil 2.0.3 is currently up-to-date, so no pin needed
79+
# [ "goblint-cil.2.0.3" "git+https://github.com/goblint/cil.git#d2760bacfbfdb25a374254de44f2ff1cb5f42abd" ]
7980
# TODO: add back after release, only pinned for optimization (https://github.com/ocaml-ppx/ppx_deriving/pull/252)
8081
[ "ppx_deriving.5.2.1" "git+https://github.com/ocaml-ppx/ppx_deriving.git#0a89b619f94cbbfc3b0fb3255ab4fe5bc77d32d6" ]
8182
]

goblint.opam.locked

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ depends: [
5959
"fileutils" {= "0.6.4"}
6060
"fmt" {= "0.9.0"}
6161
"fpath" {= "0.7.3"}
62-
"goblint-cil" {= "2.0.2"}
62+
"goblint-cil" {= "2.0.3"}
6363
"integers" {= "0.7.0"}
6464
"json-data-encoding" {= "0.12.1"}
6565
"jsonrpc" {= "1.15.0~5.0preview1"}
@@ -130,10 +130,6 @@ post-messages: [
130130
]
131131
# TODO: manually reordered to avoid opam pin crash: https://github.com/ocaml/opam/issues/4936
132132
pin-depends: [
133-
[
134-
"goblint-cil.2.0.2"
135-
"git+https://github.com/goblint/cil.git#c7ffc37ad83216a84d90fdbf427cc02a68ea5331"
136-
]
137133
[
138134
"ppx_deriving.5.2.1"
139135
"git+https://github.com/ocaml-ppx/ppx_deriving.git#0a89b619f94cbbfc3b0fb3255ab4fe5bc77d32d6"

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-distribution != "alpine" & arch != "arm64"
44
pin-depends: [
5-
[ "goblint-cil.2.0.2" "git+https://github.com/goblint/cil.git#c7ffc37ad83216a84d90fdbf427cc02a68ea5331" ]
5+
# published goblint-cil 2.0.3 is currently up-to-date, so no pin needed
6+
# [ "goblint-cil.2.0.3" "git+https://github.com/goblint/cil.git#d2760bacfbfdb25a374254de44f2ff1cb5f42abd" ]
67
# TODO: add back after release, only pinned for optimization (https://github.com/ocaml-ppx/ppx_deriving/pull/252)
78
[ "ppx_deriving.5.2.1" "git+https://github.com/ocaml-ppx/ppx_deriving.git#0a89b619f94cbbfc3b0fb3255ab4fe5bc77d32d6" ]
89
]

gobview

0 commit comments

Comments
 (0)