Merge pull request 'fix CI' (#173) from ci into main

Reviewed-on: #173

bin/dune

@@ -7,10 +7,13 @@
  (public_name builder-web)
  (name builder_web_app)
  (modules builder_web_app)
- (libraries builder_web builder_system mirage-crypto-rng.unix cmdliner logs.cli metrics metrics-lwt metrics-influx metrics-rusage ipaddr ipaddr.unix http_status_metrics))
+ (libraries builder_web builder_system mirage-crypto-rng.unix cmdliner
+   logs.cli metrics metrics-lwt metrics-influx metrics-rusage ipaddr
+   ipaddr.unix http_status_metrics))
 
 (executable
  (public_name builder-db)
  (name builder_db_app)
  (modules builder_db_app)
- (libraries builder_web builder_db builder_system caqti.blocking uri bos fmt logs logs.cli logs.fmt cmdliner mirage-crypto-rng.unix builder))
+ (libraries builder_web builder_db builder_system caqti.blocking uri bos fmt
+   logs logs.cli logs.fmt cmdliner mirage-crypto-rng.unix builder))

bin/migrations/dune

@@ -1,4 +1,5 @@
 (executable
  (public_name builder-migrations)
  (name builder_migrations)
- (libraries builder_system builder_db caqti caqti-driver-sqlite3 caqti.blocking cmdliner logs logs.cli logs.fmt opam-format bos duration))
+ (libraries builder_system builder_db caqti caqti-driver-sqlite3
+   caqti.blocking cmdliner logs logs.cli logs.fmt opam-format bos duration))

builder-web.opam

@@ -49,10 +49,11 @@ depends: [
   "tar"
   "owee"
   "solo5-elftool" {>= "0.3.0"}
-  "decompress"
+  "decompress" {>= "1.5.0"}
   "alcotest" {with-test}
   "ppx_deriving" {with-test}
   "ppx_deriving_yojson" {with-test}
+  "yojson" {with-test}
 ]
 
 synopsis: "Web interface for builder"

db/dune

@@ -1,3 +1,4 @@
 (library
  (name builder_db)
- (libraries builder caqti caqti-driver-sqlite3 asn1-combinators mirage-crypto builder_web_auth))
+ (libraries builder caqti caqti-driver-sqlite3 asn1-combinators mirage-crypto
+   builder_web_auth))

lib/dune

@@ -1,21 +1,5 @@
 (library
  (name builder_web)
- (libraries
+ (libraries builder builder_db dream tyxml bos duration hex caqti-lwt
-  builder
+   opamdiff ptime.clock.os cmarkit tar owee solo5-elftool decompress.de
-  builder_db
+   decompress.gz uri))
-  dream
-  tyxml
-  bos
-  duration
-  hex
-  caqti-lwt
-  opamdiff
-  ptime.clock.os
-  cmarkit
-  tar
-  owee
-  solo5-elftool
-  decompress.de
-  decompress.gz
-  uri
-  ))

test/dune

@@ -13,8 +13,4 @@
  (modules router)
  (libraries builder_web fmt dream yojson alcotest)
  (preprocess
-  (pps
+  (pps ppx_deriving.std ppx_deriving_yojson)))
-   ppx_deriving.std
-   ppx_deriving_yojson
-   ))
- )