Merge pull request #493 from MisterDA/dune-3-fixes

Dune 3 fixes (with vendored deps)
ocurrent · Jul 15, 2022 · 74db983 · 74db983
2 parents 092bca9 + db5f018
commit 74db983
Show file tree

Hide file tree

Showing 16 changed files with 17 additions and 19 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,6 +1,6 @@
-FROM ocaml/opam:debian-11-ocaml-4.14@sha256:b83fcce3b715fe10ee2d3060763379e1ad9be76832d67203652f2c0abd6ae50d AS build
+FROM ocaml/opam:debian-11-ocaml-4.14@sha256:5b9de826b22c77a0654519d0959536f93a6ffd7020712a8b1c3437445e031e04 AS build
 RUN sudo apt-get update && sudo apt-get install libev-dev capnproto m4 pkg-config libsqlite3-dev libgmp-dev graphviz -y --no-install-recommends
-RUN cd ~/opam-repository && git fetch origin master && git reset --hard 11e634fd946c90fdb26c14ae5f7759e644c898f0 && opam update
+RUN cd ~/opam-repository && git fetch origin master && git reset --hard 97da9a1b68b824a65a09e5f7d071fcf2da35bd1b && opam update
 COPY --chown=opam \
 	ocurrent/current_docker.opam \
 	ocurrent/current_github.opam \

diff --git a/Dockerfile.web b/Dockerfile.web
@@ -1,6 +1,6 @@
-FROM ocaml/opam:debian-11-ocaml-4.14@sha256:b83fcce3b715fe10ee2d3060763379e1ad9be76832d67203652f2c0abd6ae50d AS build
+FROM ocaml/opam:debian-11-ocaml-4.14@sha256:5b9de826b22c77a0654519d0959536f93a6ffd7020712a8b1c3437445e031e04 AS build
 RUN sudo apt-get update && sudo apt-get install libev-dev capnproto m4 pkg-config libgmp-dev -y --no-install-recommends
-RUN cd ~/opam-repository && git fetch origin master && git reset --hard 11e634fd946c90fdb26c14ae5f7759e644c898f0 && opam update
+RUN cd ~/opam-repository && git fetch origin master && git reset --hard 97da9a1b68b824a65a09e5f7d071fcf2da35bd1b && opam update
 COPY --chown=opam \
 	ocurrent/current_rpc.opam \
 	/src/ocurrent/

diff --git a/client/main.mli b/client/main.mli
diff --git a/dune-project b/dune-project
@@ -1,4 +1,4 @@
-(lang dune 3.0)
+(lang dune 3.3)
 (name ocaml-ci-api)
 (formatting disabled)
 (generate_opam_files true)
@@ -67,7 +67,7 @@
   (ppx_deriving_yojson (>= 3.6.1))
   (ppx_deriving (>= 5.1))
   yojson
-  lwt
+  (lwt (>= 5.6.1))
   logs
   fmt
   ocaml-ci
@@ -92,7 +92,7 @@
   (ansi (>= 0.5.0))
   (prometheus-app (>= 1.2))
   (cmdliner (>= 1.1.0))
-  lwt
+  (lwt (>= 5.6.1))
   (cohttp-lwt-unix (>= 2.2.0))
   tyxml
   (capnp-rpc-unix (>= 1.2))

diff --git a/lib/index.ml b/lib/index.ml
@@ -6,7 +6,6 @@ module Db = Current.Db
 module Job_map = Astring.String.Map
 
 type t = {
-  db : Sqlite3.db;
   record_job : Sqlite3.stmt;
   remove : Sqlite3.stmt;
   get_jobs : Sqlite3.stmt;
@@ -56,7 +55,6 @@ CREATE TABLE IF NOT EXISTS ci_build_index (
   let full_hash = Sqlite3.prepare db "SELECT DISTINCT hash FROM ci_build_index \
                                       WHERE owner = ? AND name = ? AND hash LIKE ?" in
       {
-        db;
         record_job;
         remove;
         get_jobs;

diff --git a/ocaml-ci-api.opam b/ocaml-ci-api.opam
@@ -6,7 +6,7 @@ authors: ["[email protected]"]
 homepage: "https://github.com/ocurrent/ocaml-ci"
 bug-reports: "https://github.com/ocurrent/ocaml-ci/issues"
 depends: [
-  "dune" {>= "3.0"}
+  "dune" {>= "3.3"}
   "current_rpc"
   "capnp" {>= "3.4.0"}
   "capnp-rpc-lwt"

diff --git a/ocaml-ci-client.opam b/ocaml-ci-client.opam
@@ -6,7 +6,7 @@ authors: ["[email protected]"]
 homepage: "https://github.com/ocurrent/ocaml-ci"
 bug-reports: "https://github.com/ocurrent/ocaml-ci/issues"
 depends: [
-  "dune" {>= "3.0"}
+  "dune" {>= "3.3"}
   "logs" {>= "0.7.0"}
   "fmt" {>= "0.8.9"}
   "current_rpc"

diff --git a/ocaml-ci-service.opam b/ocaml-ci-service.opam
@@ -6,7 +6,7 @@ authors: ["[email protected]"]
 homepage: "https://github.com/ocurrent/ocaml-ci"
 bug-reports: "https://github.com/ocurrent/ocaml-ci/issues"
 depends: [
-  "dune" {>= "3.0"}
+  "dune" {>= "3.3"}
   "prometheus-app" {>= "1.2"}
   "ppx_sexp_conv" {>= "v0.14.1"}
   "ppx_deriving_yojson" {>= "3.6.1"}

diff --git a/ocaml-ci-solver.opam b/ocaml-ci-solver.opam
@@ -6,11 +6,11 @@ authors: ["[email protected]"]
 homepage: "https://github.com/ocurrent/ocaml-ci"
 bug-reports: "https://github.com/ocurrent/ocaml-ci/issues"
 depends: [
-  "dune" {>= "3.0"}
+  "dune" {>= "3.3"}
   "ppx_deriving_yojson" {>= "3.6.1"}
   "ppx_deriving" {>= "5.1"}
   "yojson"
-  "lwt"
+  "lwt" {>= "5.6.1"}
   "logs"
   "fmt"
   "ocaml-ci"

diff --git a/ocaml-ci-web.opam b/ocaml-ci-web.opam
@@ -6,7 +6,7 @@ authors: ["[email protected]"]
 homepage: "https://github.com/ocurrent/ocaml-ci"
 bug-reports: "https://github.com/ocurrent/ocaml-ci/issues"
 depends: [
-  "dune" {>= "3.0"}
+  "dune" {>= "3.3"}
   "crunch" {>= "3.2.0" & build}
   "yojson" {>= "1.7.0"}
   "logs" {>= "0.7.0"}
@@ -15,7 +15,7 @@ depends: [
   "ansi" {>= "0.5.0"}
   "prometheus-app" {>= "1.2"}
   "cmdliner" {>= "1.1.0"}
-  "lwt"
+  "lwt" {>= "5.6.1"}
   "cohttp-lwt-unix" {>= "2.2.0"}
   "tyxml"
   "capnp-rpc-unix" {>= "1.2"}

diff --git a/ocaml-ci.opam b/ocaml-ci.opam
@@ -6,7 +6,7 @@ authors: ["[email protected]"]
 homepage: "https://github.com/ocurrent/ocaml-ci"
 bug-reports: "https://github.com/ocurrent/ocaml-ci/issues"
 depends: [
-  "dune" {>= "3.0"}
+  "dune" {>= "3.3"}
   "logs"
   "current"
   "current_docker"

diff --git a/ocluster b/ocluster
diff --git a/ocurrent b/ocurrent
diff --git a/service/local.mli b/service/local.mli
diff --git a/service/main.mli b/service/main.mli
diff --git a/solver/main.mli b/solver/main.mli
+1 −0		.gitmodules
+2 −2		Dockerfile
+3 −3		Dockerfile.worker
+0 −0		bin/admin.mli
+0 −0		bin/client.mli
+1 −9		bin/scheduler.ml
+2 −2		current_ocluster.opam
+5 −5		dune-project
+1 −1		obuilder
+2 −2		ocluster-api.opam
+3 −3		ocluster.opam
+1 −1		scheduler/pool.ml
+2 −2		scheduler/pool.mli
+0 −0		stress/stress.mli
+0 −0		test/test.mli
+3 −3		test/test_plugin.ml
+4 −4		test/test_scheduling.ml
+0 −0		test/test_scheduling.mli
+1 −1		worker/cluster_worker.ml