Replace git submodules with published dependencies (#301)

shonfeder · web-flow · commit 34d37262b0b3 · 2024-11-06T20:03:13.000Z
* Replace git submodules with published dependencies Contributes to tarides/infrastructure#389 * Fix win_ver API Following the guidance at ocurrent/ocluster#254 (comment), lets us compile using the latest released version of ocluster. * Update opam hash
diff --git a/.gitmodules b/.gitmodules
diff --git a/Dockerfile b/Dockerfile
@@ -1,28 +1,11 @@
-FROM ocaml/opam:debian-12-ocaml-4.14@sha256:b716ae07fd6520cc80c71eb199239c73558732a3df313a6296a61999c8b44ab0 as build
+FROM ocaml/opam:debian-12-ocaml-4.14@sha256:b716ae07fd6520cc80c71eb199239c73558732a3df313a6296a61999c8b44ab0 AS build
 RUN sudo apt-get update && sudo apt-get install libev-dev capnproto graphviz m4 pkg-config libsqlite3-dev libgmp-dev libssl-dev libffi-dev -y --no-install-recommends
-RUN cd ~/opam-repository && git fetch -q origin master && git reset --hard 86cb2b7655a9e49f365e4037814df866fc115344 && opam update
-COPY --chown=opam \
-  ocurrent/current.opam \
-  ocurrent/current_web.opam \
-  ocurrent/current_docker.opam \
-  ocurrent/current_git.opam \
-  ocurrent/current_github.opam \
-  ocurrent/current_slack.opam \
-  ocurrent/current_rpc.opam \
-  /src/ocurrent/
-COPY --chown=opam \
-  ocluster/*.opam \
-  /src/ocluster/
+RUN cd ~/opam-repository && git fetch -q origin master && git reset --hard d910b0617a51ea90e4547db13a509962fc504f70 && opam update
+
 WORKDIR /src
-RUN opam pin add -yn current_docker.dev "./ocurrent" && \
-  opam pin add -yn current_git.dev "./ocurrent" && \
-  opam pin add -yn current_github.dev "./ocurrent" && \
-  opam pin add -yn current.dev "./ocurrent" && \
-  opam pin add -yn current_rpc.dev "./ocurrent" && \
-  opam pin add -yn current_slack.dev "./ocurrent" && \
-  opam pin add -yn current_web.dev "./ocurrent" && \
-  opam pin add -yn current_ocluster.dev "./ocluster" && \
-  opam pin add -yn ocluster-api.dev "./ocluster"
+# See https://github.com/ocurrent/ocaml-docs-ci/pull/177#issuecomment-2445338172
+RUN sudo chown opam:opam $(pwd)
+
 COPY --chown=opam base-images.opam /src/
 RUN opam install -y --deps-only .
 ADD --chown=opam . .
diff --git a/base-images.opam b/base-images.opam
@@ -17,19 +17,19 @@ depends: [
   "lwt" {>= "5.6.1"}
   "logs"
   "fmt" {>= "0.8.7"}
-  "current" {>= "0.6.4"}
+  "current" {>= "0.6.6"}
   "current_git"
   "current_github"
   "current_docker"
-  "current_ocluster"
+  "current_ocluster" {>= "0.3.0"}
   "current_slack"
   "current_web"
   "current_rpc"
   "capnp-rpc-unix" {>= "1.2.3"}
   "cmdliner" {>= "1.1.1"}
   "dockerfile" {>= "8.2.3"}
   "dockerfile-opam" {>= "8.2.3"}
-  "ocaml-version" {>= "3.6.1"}
+  "ocaml-version" {>= "3.6.9"}
   "timedesc" {>= "3.0.0"}
   "odoc" {with-doc}
 ]
diff --git a/builds.expected b/builds.expected
@@ -10753,7 +10753,7 @@ fedora-41/arm64
 	LABEL distro_style="rpm"
 	RUN yum --version || dnf install -y yum
 	RUN yum update -y
-	RUN yum group install -y "c-development" && yum clean packages
+	RUN yum groupinstall -y "C Development Tools and Libraries" && yum clean packages
 	RUN yum install -y git patch unzip which tar curl xz libcap-devel openssl sudo bzip2 && yum clean packages
 	RUN git config --global user.email "docker@example.com"
 	RUN git config --global user.name "Docker"
@@ -10767,7 +10767,7 @@ fedora-41/arm64
 	FROM fedora:41
 	RUN yum --version || dnf install -y yum
 	RUN yum update -y
-	RUN yum group install -y "c-development" && yum clean packages
+	RUN yum groupinstall -y "C Development Tools and Libraries" && yum clean packages
 	RUN yum install -y sudo passwd bzip2 unzip patch rsync nano gcc-c++ git tar curl xz libX11-devel which m4 diffutils findutils bubblewrap && yum clean packages
 	COPY --from=0 [ "/usr/bin/opam-2.0", "/usr/bin/opam-2.0" ]
 	RUN ln /usr/bin/opam-2.0 /usr/bin/opam
@@ -10831,7 +10831,7 @@ fedora-41/amd64
 	LABEL distro_style="rpm"
 	RUN yum --version || dnf install -y yum
 	RUN yum update -y
-	RUN yum group install -y "c-development" && yum clean packages
+	RUN yum groupinstall -y "C Development Tools and Libraries" && yum clean packages
 	RUN yum install -y git patch unzip which tar curl xz libcap-devel openssl sudo bzip2 && yum clean packages
 	RUN git config --global user.email "docker@example.com"
 	RUN git config --global user.name "Docker"
@@ -10845,7 +10845,7 @@ fedora-41/amd64
 	FROM fedora:41
 	RUN yum --version || dnf install -y yum
 	RUN yum update -y
-	RUN yum group install -y "c-development" && yum clean packages
+	RUN yum groupinstall -y "C Development Tools and Libraries" && yum clean packages
 	RUN yum install -y sudo passwd bzip2 unzip patch rsync nano gcc-c++ git tar curl xz libX11-devel which m4 diffutils findutils bubblewrap && yum clean packages
 	COPY --from=0 [ "/usr/bin/opam-2.0", "/usr/bin/opam-2.0" ]
 	RUN ln /usr/bin/opam-2.0 /usr/bin/opam
diff --git a/dune b/dune
@@ -1,7 +1,5 @@
 (dirs :standard \ var)
 
-(vendored_dirs ocaml-version ocaml-dockerfile ocurrent ocluster)
-
 (rule
  (target builds.actual)
  (action
diff --git a/dune-project b/dune-project
@@ -21,17 +21,17 @@
   (lwt (>= 5.6.1))
   logs
   (fmt (>= 0.8.7))
-  (current (>= 0.6.4))
+  (current (>= 0.6.6))
   current_git
   current_github
   current_docker
-  current_ocluster
+  (current_ocluster (>= 0.3.0))
   current_slack
   current_web
   current_rpc
   (capnp-rpc-unix (>= 1.2.3))
   (cmdliner (>= 1.1.1))
   (dockerfile (>= 8.2.3))
   (dockerfile-opam (>= 8.2.3))
-  (ocaml-version (>= 3.6.1))
+  (ocaml-version (>= 3.6.9))
   (timedesc (>= 3.0.0))))
diff --git a/ocaml-dockerfile b/ocaml-dockerfile
diff --git a/ocaml-version b/ocaml-version
diff --git a/ocluster b/ocluster
diff --git a/ocurrent b/ocurrent
diff --git a/src/base_images.ml b/src/base_images.ml
@@ -76,7 +76,7 @@ let main () config mode channel capnp_address github_auth submission_uri staging
     let submission_cap = Capnp_rpc_unix.Vat.import_exn vat submission_uri in
     let connection = Current_ocluster.Connection.create submission_cap in
     let ocluster = Current_ocluster.v ?push_auth:staging_auth ~urgent:`Never connection in
-    let engine = Current.Engine.create ~config (Pipeline.v ?channel ~ocluster) in
+    let engine = Current.Engine.create ~config (Pipeline.v ?channel ~connection ~ocluster) in
     rpc_engine_resolver |> Option.iter (fun r -> Capability.resolve_ok r (Rpc.engine engine));
     let authn = Option.map Current_github.Auth.make_login_uri github_auth in
     let has_role =
diff --git a/src/pipeline.ml b/src/pipeline.ml
@@ -470,8 +470,8 @@ let notify_status ?channel x =
       x   (* If [x] fails, the whole pipeline should fail too. *)
     ]
 
-let v ?channel ~ocluster () =
+let v ?channel ~connection ~ocluster () =
   if Conf.auth = None then Fmt.pr "Password file %S not found; images will not be pushed to hub@." Conf.password_path;
   let repos = git_repositories () in
-  let wv = win_ver ocluster in
+  let wv = win_ver connection  in
   Real.v ~ocluster ~repos ~windows_version:wv |> notify_status ?channel
diff --git a/src/pipeline.mli b/src/pipeline.mli
@@ -12,5 +12,10 @@ module Make (OCurrent : S.OCURRENT) : sig
   val v : ocluster:OCluster.t -> repos:(Git_repositories.t Current.t) -> windows_version:(string Current.t Windows_map.t) -> unit Current.t
 end
 
-val v : ?channel:Current_slack.channel -> ocluster:Current_ocluster.t -> unit -> unit Current.t
+val v
+  : ?channel:Current_slack.channel
+  -> connection:Current_ocluster.Connection.t
+  -> ocluster:Current_ocluster.t
+  -> unit
+  -> unit Current.t
 (** The main pipeline. Builds images for all supported distribution, compiler version and architecture combinations. *)
diff --git a/src/win_ver.ml b/src/win_ver.ml
@@ -4,9 +4,8 @@ open Current.Syntax
 let ( >>!= ) = Lwt_result.bind
 
 module Products = struct
-  type t = {
-    ocluster : Current_ocluster.t;
-  }
+  type t = Current_ocluster.Connection.t
+
 
   let id = "win-version"
 
@@ -58,10 +57,10 @@ module Products = struct
       | [_; rest ] when Astring.String.is_prefix ~affix:"OuTPuT\r\n" rest -> Lwt_result.return ""
       | _ -> Lwt_result.fail (`Msg "Missing output from command\n\n")
 
-  let build { ocluster } job {Key.product; pool} =
+  let build connection job {Key.product; pool} =
     let spec_str = Printf.sprintf "FROM %s\nRUN for /f \"tokens=4 delims=[] \" %%a in ('ver') do echo %.0f& echo OuTPuT& echo %%a& echo OuTPuT" product (Unix.time ()) in
     let action = Cluster_api.Submission.docker_build (`Contents spec_str) in
-    let pool = Current_ocluster.Connection.pool ~job ~pool ~action ~cache_hint:product (Current_ocluster.connection ocluster) in
+    let pool = Current_ocluster.Connection.pool ~job ~pool ~action ~cache_hint:product connection in
     Current.Job.start_with ~pool job ~level:Current.Level.Mostly_harmless >>=
     parse_output job
 
@@ -72,8 +71,7 @@ end
 
 module Cache = Current_cache.Make(Products)
 
-let get ~schedule ocluster product pool =
+let get ~schedule connection product pool =
   Current.component "%s" product |>
   let> key = Current.return { Products.Key.product = product; pool } in
-  Cache.get ~schedule { Products.ocluster } key
-
+  Cache.get ~schedule connection key
diff --git a/src/win_ver.mli b/src/win_ver.mli
@@ -1,2 +1,2 @@
 
-val get : schedule:Current_cache.Schedule.t -> Current_ocluster.t -> string -> string -> string Current.t
+val get : schedule:Current_cache.Schedule.t -> Current_ocluster.Connection.t -> string -> string -> string Current.t
