Skip to content

Commit ed5f259

Browse files
committed
Revert "Disable pins for v2.3.0 release"
This reverts commit dbd6479.
1 parent 8c08a78 commit ed5f259

File tree

3 files changed

+13
-6
lines changed

3 files changed

+13
-6
lines changed

goblint.opam

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,12 +74,12 @@ dev-repo: "git+https://github.com/goblint/analyzer.git"
7474
# on `dune build` goblint.opam will be generated from goblint.opam.template and dune-project
7575
# also remember to generate/adjust goblint.opam.locked!
7676
available: os-distribution != "alpine" & arch != "arm64"
77-
# pin-depends: [
77+
pin-depends: [
7878
# published goblint-cil 2.0.3 is currently up-to-date, so no pin needed
7979
# [ "goblint-cil.2.0.3" "git+https://github.com/goblint/cil.git#d2760bacfbfdb25a374254de44f2ff1cb5f42abd" ]
8080
# TODO: add back after release, only pinned for optimization (https://github.com/ocaml-ppx/ppx_deriving/pull/252)
81-
# [ "ppx_deriving.5.2.1" "git+https://github.com/ocaml-ppx/ppx_deriving.git#0a89b619f94cbbfc3b0fb3255ab4fe5bc77d32d6" ]
82-
# ]
81+
[ "ppx_deriving.5.2.1" "git+https://github.com/ocaml-ppx/ppx_deriving.git#0a89b619f94cbbfc3b0fb3255ab4fe5bc77d32d6" ]
82+
]
8383
post-messages: [
8484
"Do not benchmark Goblint on OCaml 5 (https://goblint.readthedocs.io/en/latest/user-guide/benchmarking/)." {ocaml:version >= "5.0.0"}
8585
]

goblint.opam.locked

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,3 +128,10 @@ conflicts: [
128128
post-messages: [
129129
"Do not benchmark Goblint on OCaml 5 (https://goblint.readthedocs.io/en/latest/user-guide/benchmarking/)." {ocaml:version >= "5.0.0"}
130130
]
131+
# TODO: manually reordered to avoid opam pin crash: https://github.com/ocaml/opam/issues/4936
132+
pin-depends: [
133+
[
134+
"ppx_deriving.5.2.1"
135+
"git+https://github.com/ocaml-ppx/ppx_deriving.git#0a89b619f94cbbfc3b0fb3255ab4fe5bc77d32d6"
136+
]
137+
]

goblint.opam.template

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
# on `dune build` goblint.opam will be generated from goblint.opam.template and dune-project
22
# also remember to generate/adjust goblint.opam.locked!
33
available: os-distribution != "alpine" & arch != "arm64"
4-
# pin-depends: [
4+
pin-depends: [
55
# published goblint-cil 2.0.3 is currently up-to-date, so no pin needed
66
# [ "goblint-cil.2.0.3" "git+https://github.com/goblint/cil.git#d2760bacfbfdb25a374254de44f2ff1cb5f42abd" ]
77
# TODO: add back after release, only pinned for optimization (https://github.com/ocaml-ppx/ppx_deriving/pull/252)
8-
# [ "ppx_deriving.5.2.1" "git+https://github.com/ocaml-ppx/ppx_deriving.git#0a89b619f94cbbfc3b0fb3255ab4fe5bc77d32d6" ]
9-
# ]
8+
[ "ppx_deriving.5.2.1" "git+https://github.com/ocaml-ppx/ppx_deriving.git#0a89b619f94cbbfc3b0fb3255ab4fe5bc77d32d6" ]
9+
]
1010
post-messages: [
1111
"Do not benchmark Goblint on OCaml 5 (https://goblint.readthedocs.io/en/latest/user-guide/benchmarking/)." {ocaml:version >= "5.0.0"}
1212
]

0 commit comments

Comments
 (0)