From 207252401faf38c3d404e059ab42f4a0fc9bb18c Mon Sep 17 00:00:00 2001 From: Hannes Mehnert Date: Tue, 12 Sep 2023 13:10:10 +0200 Subject: [PATCH 1/3] auto-format --- bin/dune | 7 +++++-- bin/migrations/dune | 3 ++- db/dune | 3 ++- lib/dune | 22 +++------------------- test/dune | 6 +----- 5 files changed, 13 insertions(+), 28 deletions(-) diff --git a/bin/dune b/bin/dune index 98e4094..040058c 100644 --- a/bin/dune +++ b/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)) diff --git a/bin/migrations/dune b/bin/migrations/dune index b27283f..6a75a8f 100644 --- a/bin/migrations/dune +++ b/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)) diff --git a/db/dune b/db/dune index e650505..a676728 100644 --- a/db/dune +++ b/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)) diff --git a/lib/dune b/lib/dune index 654f735..dd075a5 100644 --- a/lib/dune +++ b/lib/dune @@ -1,21 +1,5 @@ (library (name builder_web) - (libraries - builder - builder_db - dream - tyxml - bos - duration - hex - caqti-lwt - opamdiff - ptime.clock.os - cmarkit - tar - owee - solo5-elftool - decompress.de - decompress.gz - uri - )) + (libraries builder builder_db dream tyxml bos duration hex caqti-lwt + opamdiff ptime.clock.os cmarkit tar owee solo5-elftool decompress.de + decompress.gz uri)) diff --git a/test/dune b/test/dune index 704dc18..859c0ca 100644 --- a/test/dune +++ b/test/dune @@ -13,8 +13,4 @@ (modules router) (libraries builder_web fmt dream yojson alcotest) (preprocess - (pps - ppx_deriving.std - ppx_deriving_yojson - )) - ) + (pps ppx_deriving.std ppx_deriving_yojson))) From 665bd0dfe8cbdb7ba42fa59ae6c68c0b8a5df293 Mon Sep 17 00:00:00 2001 From: Hannes Mehnert Date: Tue, 12 Sep 2023 13:11:14 +0200 Subject: [PATCH 2/3] add yojson with-test dependency --- builder-web.opam | 1 + 1 file changed, 1 insertion(+) diff --git a/builder-web.opam b/builder-web.opam index d36fa2a..920db29 100644 --- a/builder-web.opam +++ b/builder-web.opam @@ -53,6 +53,7 @@ depends: [ "alcotest" {with-test} "ppx_deriving" {with-test} "ppx_deriving_yojson" {with-test} + "yojson" {with-test} ] synopsis: "Web interface for builder" From 2b30ab6bf9c5e0db9068910abd303cace3a27cf8 Mon Sep 17 00:00:00 2001 From: Hannes Mehnert Date: Tue, 12 Sep 2023 13:13:51 +0200 Subject: [PATCH 3/3] lower-bounds: add one for decompress (needing the gz subpackage) --- builder-web.opam | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builder-web.opam b/builder-web.opam index 920db29..fed3f7a 100644 --- a/builder-web.opam +++ b/builder-web.opam @@ -49,7 +49,7 @@ 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}