Skip to content

Commit

Permalink
Merge pull request #1518 from samoht/fix-release
Browse files Browse the repository at this point in the history
Bump mirage-runtime versions in the generated opam files
  • Loading branch information
samoht committed Apr 10, 2024
2 parents 8d80e4d + 5a9db89 commit 88faf8f
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 10 deletions.
2 changes: 1 addition & 1 deletion lib/mirage.ml
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,7 @@ let run t = %s.Main.run t ; exit 0|ocaml}
let keys = Key.[ v target ] in
let packages_v =
(* XXX: use %%VERSION_NUM%% here instead of hardcoding a version? *)
let min = "4.4.0" and max = "4.5.0" in
let min = "4.5.0" and max = "4.6.0" in
let common =
[
package ~scope:`Monorepo "lwt";
Expand Down
3 changes: 2 additions & 1 deletion mirage.opam
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,10 @@ depends: [
"fpath"
"rresult" {>= "0.7.0"}
"uri" {>= "4.2.0"}
"logs"
"logs" {>= "0.7.0"}
"opam-monorepo" {>= "0.3.2"}
"alcotest" {with-test}
"mirage-runtime" {with-test & = version}
]

conflicts: [ "jbuilder" {with-test} ]
Expand Down
8 changes: 4 additions & 4 deletions test/mirage/query/run-hvt.t
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ Query opam file
depends: [
"duration" { ?monorepo & < "1.0.0" }
"lwt" { ?monorepo }
"mirage" { build & >= "4.4.0" & < "4.5.0" }
"mirage" { build & >= "4.5.0" & < "4.6.0" }
"mirage-bootvar-solo5" { ?monorepo & >= "0.6.0" & < "0.7.0" }
"mirage-clock-solo5" { ?monorepo & >= "4.2.0" & < "5.0.0" }
"mirage-logs" { ?monorepo & >= "2.0.0" & < "3.0.0" }
"mirage-runtime" { ?monorepo & >= "4.4.0" & < "4.5.0" }
"mirage-runtime" { ?monorepo & >= "4.5.0" & < "4.6.0" }
"mirage-solo5" { ?monorepo & >= "0.9.0" & < "0.10.0" }
"ocaml-solo5" { build & >= "0.8.2" & < "0.9.0" }
"opam-monorepo" { build & >= "0.3.2" }
Expand All @@ -53,11 +53,11 @@ Query packages
$ ./config.exe query --target hvt packages
"duration" { ?monorepo & < "1.0.0" }
"lwt" { ?monorepo }
"mirage" { build & >= "4.4.0" & < "4.5.0" }
"mirage" { build & >= "4.5.0" & < "4.6.0" }
"mirage-bootvar-solo5" { ?monorepo & >= "0.6.0" & < "0.7.0" }
"mirage-clock-solo5" { ?monorepo & >= "4.2.0" & < "5.0.0" }
"mirage-logs" { ?monorepo & >= "2.0.0" & < "3.0.0" }
"mirage-runtime" { ?monorepo & >= "4.4.0" & < "4.5.0" }
"mirage-runtime" { ?monorepo & >= "4.5.0" & < "4.6.0" }
"mirage-solo5" { ?monorepo & >= "0.9.0" & < "0.10.0" }
"ocaml-solo5" { build & >= "0.8.2" & < "0.9.0" }
"opam-monorepo" { build & >= "0.3.2" }
Expand Down
8 changes: 4 additions & 4 deletions test/mirage/query/run.t
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@ Query opam file
depends: [
"duration" { ?monorepo & < "1.0.0" }
"lwt" { ?monorepo }
"mirage" { build & >= "4.4.0" & < "4.5.0" }
"mirage" { build & >= "4.5.0" & < "4.6.0" }
"mirage-bootvar-unix" { ?monorepo & >= "0.1.0" & < "0.2.0" }
"mirage-clock-unix" { ?monorepo & >= "3.0.0" & < "5.0.0" }
"mirage-logs" { ?monorepo & >= "2.0.0" & < "3.0.0" }
"mirage-runtime" { ?monorepo & >= "4.4.0" & < "4.5.0" }
"mirage-runtime" { ?monorepo & >= "4.5.0" & < "4.6.0" }
"mirage-unix" { ?monorepo & >= "5.0.0" & < "6.0.0" }
"opam-monorepo" { build & >= "0.3.2" }
]
Expand All @@ -55,11 +55,11 @@ Query packages
$ ./config.exe query packages
"duration" { ?monorepo & < "1.0.0" }
"lwt" { ?monorepo }
"mirage" { build & >= "4.4.0" & < "4.5.0" }
"mirage" { build & >= "4.5.0" & < "4.6.0" }
"mirage-bootvar-unix" { ?monorepo & >= "0.1.0" & < "0.2.0" }
"mirage-clock-unix" { ?monorepo & >= "3.0.0" & < "5.0.0" }
"mirage-logs" { ?monorepo & >= "2.0.0" & < "3.0.0" }
"mirage-runtime" { ?monorepo & >= "4.4.0" & < "4.5.0" }
"mirage-runtime" { ?monorepo & >= "4.5.0" & < "4.6.0" }
"mirage-unix" { ?monorepo & >= "5.0.0" & < "6.0.0" }
"opam-monorepo" { build & >= "0.3.2" }

Expand Down

0 comments on commit 88faf8f

Please sign in to comment.