adapt to new released mirage-xen & mirage-solo5 #1338
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
require ocaml-solo5 0.8.1 and mirage-solo5 0.9.0 and mirage-xen 8.0.0
…, different semantics)
|
I relaunched the CI with a new fetch of |
|
since the CI is still failing, I remember that it (used to?) has some specific opam-repository commit / is not updating the opam repository at each run -- is this correct (and could that please be documented somewhere @TheLortex)? |
|
It's failing because of the conflict between the unikernel's requirement on mirage-solo5 and |
|
ok, thanks. sorry for not reading the CI output correctly. |
No problem, opam-monorepo's solving errors are still harder to read than opam ones as the solver implementation is different. I have added a documentation section about updating the opam-repository commit: https://github.com/ocurrent/mirage-ci#updating-the-opam-repository-commit |
|
I opened ocaml/opam-repository#21870 and mirage/mirage-bootvar-solo5#16 for resolving the CI issue |
|
ok, CI is green now. anyone willing to review and merge? |
|
Sure, thanks |
hannesm
added a commit
to hannesm/opam-repository
that referenced
this pull request
Jul 26, 2022
… (4.2.0) CHANGES: #### Fixed - Remove non-existing mirage-repo-add and mirage-repo-rm from PHONY in generated Makefile (mirage/mirage#1332, @hannesm) - Update deprecated references (mirage/mirage#1337, @reynir) #### Changed - Prepare for reproducing unikernels with generated opam file (mirage/mirage#1335, @hannesm) - split x-mirage-configure (mirage configure), x-mirage-pre-build (make lock pull), and build instructions in opam file - embed x-mirage-extra-repo (a list of opam repositories to use) - take relative paths up to git repository into account - include x-mirage-opam-lock-location (relative to git repository root) - Adapt constraints for mirage-solo5 0.9.0 and mirage-xen 8.0.0 (ocaml-solo5 0.8.1 with trim and improved memory metrics) (mirage/mirage#1338, @hannesm, based on @palainp work) - Require opam-monorepo 0.3.2 (mirage/mirage#1332 mirage/mirage#1334, @hannesm @dinosaure) - Use OPAMVAR_monorepo instead of OPAMVAR_switch in generated opam file (mirage/mirage#1332, @hannesm) - Remove name from opam file (mirage/mirage#1332, @hannesm)
hannesm
added a commit
to hannesm/opam-repository
that referenced
this pull request
Jul 27, 2022
… (4.2.0) CHANGES: #### Fixed - Remove non-existing mirage-repo-add and mirage-repo-rm from PHONY in generated Makefile (mirage/mirage#1332, @hannesm) - Update deprecated references (mirage/mirage#1337, @reynir) #### Changed - Prepare for reproducing unikernels with generated opam file (mirage/mirage#1335, @hannesm) - split x-mirage-configure (mirage configure), x-mirage-pre-build (make lock pull), and build instructions in opam file - embed x-mirage-extra-repo (a list of opam repositories to use) - take relative paths up to git repository into account - include x-mirage-opam-lock-location (relative to git repository root) - Adapt constraints for mirage-solo5 0.9.0 and mirage-xen 8.0.0 (ocaml-solo5 0.8.1 with trim and improved memory metrics) (mirage/mirage#1338, @hannesm, based on @palainp work) - Require opam-monorepo 0.3.2 (mirage/mirage#1332 mirage/mirage#1334, @hannesm @dinosaure) - Use OPAMVAR_monorepo instead of OPAMVAR_switch in generated opam file (mirage/mirage#1332, @hannesm) - Remove name from opam file (mirage/mirage#1332, @hannesm)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
require ocaml-solo5 0.8.1 and mirage-solo5 0.9.0 and mirage-xen 8.0.0
as discussed in mirage/mirage-xen#48
this PR may need to wait for ocaml/opam-repository#21860 and ocaml/opam-repository#21861