mirage / mirage-www

Website infrastructure and content for mirage.io
https://mirage.io
ISC License
172 stars 106 forks source link

Update dependencies #815

Closed MisterDA closed 5 months ago

hannesm commented 9 months ago

Thanks for your changes, from what I can tell the issue is changes in 4.4.0. If you apply the following patch, it should work:

--- a/mirage/config.ml
+++ b/mirage/config.ml
@@ -202,10 +202,18 @@ let enable_metrics =
   let doc = Key.Arg.info ~doc:"Enable metrics reporting" [ "metrics" ] in
   Key.(create "metrics" Arg.(flag doc))

+type i0 = I0
+let i0 = Functoria.Type.v I0
+let no0 = Functoria.impl "Int" job
+
+type n1 = N1
+let n1 = Functoria.Type.v N1
+let noop1 = Functoria.impl "Set.Make" (job @-> job)
+
 let optional_monitoring time pclock stack =
   if_impl (Key.value enable_metrics)
     (mirage_monitoring $ time $ pclock $ stack)
-    noop
+    (noop1 $ no0)

 let () =
   register "www"
MisterDA commented 9 months ago

Yes, I was going to ask you :) wouldn't have figured that out!

hannesm commented 9 months ago

Yes, I was going to ask you :) wouldn't have figured that out!

Maybe the mirage tool should be relaxed to allow some jobs without arguments (maybe exactly the noop job) -- but the mirage repository is currently in unclear state -- the main branch isn't too usable, we could continue on the 4.4 branch...

MisterDA commented 9 months ago

~Unfortunately the patch for Dream that was pinned seem not to have been upstreamed.~ No, my bad, I was probably using an old version. See #813.

MisterDA commented 9 months ago

Erk, the deployer is using mirage 3… I think this PR is exceeding on the time I wanted to allocate for this, haha.

hannesm commented 9 months ago

For the patch posted above, here is a fix for the mirage utility https://github.com/mirage/mirage/pull/1491/commits/16e82ffb481fb81ef70828facb1731bc07b82b97

hannesm commented 9 months ago

Erk, the deployer is using mirage 3… I think this PR is exceeding on the time I wanted to allocate for this, haha.

That's a bit sad. Well, I don't quite understand the whole "CI" and "deployment" stuff of this repository anyways... Eventually someone will (hopefully) fix it. Even a local build doesn't work for me (as mentioned in #792).

hannesm commented 6 months ago

Thanks for your changes, from what I can tell the issue is changes in 4.4.0. If you apply the following patch, it should work:

--- a/mirage/config.ml
+++ b/mirage/config.ml
@@ -202,10 +202,18 @@ let enable_metrics =
   let doc = Key.Arg.info ~doc:"Enable metrics reporting" [ "metrics" ] in
   Key.(create "metrics" Arg.(flag doc))

+type i0 = I0
+let i0 = Functoria.Type.v I0
+let no0 = Functoria.impl "Int" job
+
+type n1 = N1
+let n1 = Functoria.Type.v N1
+let noop1 = Functoria.impl "Set.Make" (job @-> job)
+
 let optional_monitoring time pclock stack =
   if_impl (Key.value enable_metrics)
     (mirage_monitoring $ time $ pclock $ stack)
-    noop
+    (noop1 $ no0)

 let () =
   register "www"

I wanted to raise my voice that since mirage 4.4.2 got released, the above diff is not needed anymore. Not sure whether this makes any difference for this PR (which seems abandoned).

MisterDA commented 6 months ago

Hi Hannes, I'm currently away from computers until the beginning of April. Unfortunately I was unable to set up a working build environment before I left, and thus complete this PR. If you feel you can take anything from it please do, otherwise I'll try to catch up in a month or so. -- Antonin

samoht commented 5 months ago

Thanks, some of your changes have been picked by https://github.com/mirage/mirage-www/pull/818 and now the CI is green again!