-
Notifications
You must be signed in to change notification settings - Fork 106
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Deploy with OCaml 5.2 on next #840
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Apart from a small comment I wrote on the corresponding line, this looks good to me!
Dockerfile
Outdated
ARG EXTRA_FLAGS= | ||
RUN opam exec -- mirage configure -f mirage/config.ml -t $TARGET $EXTRA_FLAGS | ||
ARG EXTRA_FLAGS_NO_METRICS="--tls=true --separate-networks" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I wondered why not use EXTRA_FLAGS
instead of creating the EXTRA_FLAGS_NO_METRICS
.
Or, taken the other way around, if keeping EXTRA_FLAGS
separate is useful, shouldn’t it still appear in the configuration command lines?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Basically, the CI system always passes --metrics
through EXTRA_FLAGS
when building mirage-www
(and I don't have control over that CI system). And I couldn't find a reasonable way to do something like EXTRA_FLAGS_NO_METRICS = $EXTRA_FLAGS without --metrics
.
Another way would be for this branch to still accept --metrics but disable the underlying behavior (and not pull the dependency).
I went with the hacky solution (to hardcode what the CI passes without --metrics) to modify the code as little as possible so this experiment is representative. Then the correct solution will be to change the CI system to pass the correct flags, once we know we want to do this on main
.
I've force-pushed this to the |
Is there a plan / story what to do for changes to the main branch? should they be merged into "next"? Is there automation for doing that? I'm asking since it would be great to integrate #841 into the next branch as well. |
I don't know what the protocol is for this repo, but I'd guess that But it looks like this PR failed to deploy (https://deploy.mirage.io/job/2024-09-11/142722-mirage-deploy-84f10c):
|
This is not documented for Right now I would advise against putting anything else in Once this experiment is over we could think about a more formal process for |
We can integrate the changes of #841 to |
This is exactly #838 containing the work of @shym but tailored to be deployed on branch
next
. Its general purpose is to deploy a version ofmirage-www
built with ocaml-solo5 for 5.2 to benchmark its resource usage.This PR:
Dockerfile
used by the mirage deployer:ocaml-solo5
EXTRA_FLAGS
passed by the mirage deployer to remove--metrics
, sincemirage-memtrace
isn't readily available for OCaml 5.2That last modification is clearly a hack and should be addressed by either somehow porting
mirage-memtrace
to 5.2 or conditionally passing the right EXTRA_FLAGS in the mirage deployer, but this should be enough to do some benchmarks on thenext
branch.This otherwise syncs
next
withmaster
(dropping commits from https://github.com/mirage/mirage-www/pull/791/commits which have remained there in limbo for quite a while). Hence this will need to be force-pushed