Skip to content

Commit

Permalink
Merge pull request #1507 from palainp/bump-minimal-ocaml-solo5
Browse files Browse the repository at this point in the history
bump min ocaml-solo5 to avoid fast memory usage error
  • Loading branch information
samoht committed Apr 9, 2024
2 parents e78d19b + 38f92c8 commit 5bae42f
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 3 deletions.
2 changes: 2 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,8 @@
...
```

- bump minimal ocaml-solo5 version bound to 0.8.2 to avoid fast memory usage
error (#1507, @palainp)
- FEATURE: install `mirage` in the local duniverse. This allows `config.ml`
and `unikernel.ml` to be built simultaneously so that tools like merlin can
work on both seamlessly. This is a follow-up of #1475 (#1515, @samoht)
Expand Down
2 changes: 1 addition & 1 deletion lib/devices/target.ml
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ module Solo5 = struct

let build_packages =
[
Functoria.package ~min:"0.8.1" ~max:"0.9.0" ~scope:`Switch ~build:true
Functoria.package ~min:"0.8.2" ~max:"0.9.0" ~scope:`Switch ~build:true
"ocaml-solo5";
Functoria.package ~min:"0.7.5" ~max:"0.9.0" ~scope:`Switch ~build:true
"solo5";
Expand Down
4 changes: 2 additions & 2 deletions test/mirage/query/run-hvt.t
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ Query opam file
"mirage-logs" { ?monorepo & >= "2.0.0" & < "3.0.0" }
"mirage-runtime" { ?monorepo & >= "4.4.0" & < "4.5.0" }
"mirage-solo5" { ?monorepo & >= "0.9.0" & < "0.10.0" }
"ocaml-solo5" { build & >= "0.8.1" & < "0.9.0" }
"ocaml-solo5" { build & >= "0.8.2" & < "0.9.0" }
"opam-monorepo" { build & >= "0.3.2" }
"solo5" { build & >= "0.7.5" & < "0.9.0" }
]
Expand Down Expand Up @@ -59,7 +59,7 @@ Query packages
"mirage-logs" { ?monorepo & >= "2.0.0" & < "3.0.0" }
"mirage-runtime" { ?monorepo & >= "4.4.0" & < "4.5.0" }
"mirage-solo5" { ?monorepo & >= "0.9.0" & < "0.10.0" }
"ocaml-solo5" { build & >= "0.8.1" & < "0.9.0" }
"ocaml-solo5" { build & >= "0.8.2" & < "0.9.0" }
"opam-monorepo" { build & >= "0.3.2" }
"solo5" { build & >= "0.7.5" & < "0.9.0" }

Expand Down

0 comments on commit 5bae42f

Please sign in to comment.