Merge pull request #930 from mtelvers/gitlab

Update ocurrent and ocluster submodules
ocurrent · Apr 24, 2024 · f544ddc · f544ddc
2 parents 1a0707a + d58535e
commit f544ddc
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 10 deletions.
diff --git a/Dockerfile.gitlab b/Dockerfile.gitlab
@@ -20,18 +20,12 @@ COPY --chown=opam \
 	solver-service/solver-service-api.opam \
 	solver-service/solver-service.opam \
 	/src/solver-service/
-COPY --chown=opam \
-        ocurrent/vendor/ocaml-gitlab/gitlab.opam \
-        ocurrent/vendor/ocaml-gitlab/gitlab-unix.opam \
-	/src/ocaml-gitlab/
 COPY --chown=opam \
 	ocaml-dockerfile/dockerfile*.opam \
 	/src/ocaml-dockerfile/
 WORKDIR /src
 RUN opam pin add -yn current_docker.dev "./ocurrent" && \
     opam pin add -yn current_github.dev "./ocurrent" && \
-    opam pin add -yn gitlab.dev "./ocaml-gitlab/" && \
-    opam pin add -yn gitlab-unix.dev "./ocaml-gitlab/" && \
     opam pin add -yn current_gitlab.dev "./ocurrent" && \
     opam pin add -yn current_git.dev "./ocurrent" && \
     opam pin add -yn current.dev "./ocurrent" && \

diff --git a/dune b/dune
@@ -20,6 +20,5 @@
  opam-0install-solver
  ocluster
  ocaml-version
- ocaml-gitlab
  solver-service
  ocaml-dockerfile)
diff --git a/dune-project b/dune-project
@@ -103,7 +103,7 @@
   (alcotest (and (>= 1.7.0) :with-test))
   (cmdliner (>= 1.1.1))
   (fmt (>= 0.8.9))
-  (gitlab-unix (>= 0.1.7))
+  (gitlab-unix (>= 0.1.8))
   (logs (>= 0.7.0))
   (odoc :with-doc)
   (prometheus-app (>= 1.2))))

diff --git a/ocluster b/ocluster
diff --git a/ocurrent b/ocurrent