From 9c5f07fb82f20e555897176edc47df514bae6cef Mon Sep 17 00:00:00 2001
From: Kate <kit.ty.kate@disroot.org>
Date: Wed, 24 Jun 2020 19:50:30 +0100
Subject: [PATCH 1/4] Untag dune as a build dependency

---
 mirage-ci.opam | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mirage-ci.opam b/mirage-ci.opam
index e43e23c..55cb8d3 100644
--- a/mirage-ci.opam
+++ b/mirage-ci.opam
@@ -16,8 +16,8 @@ bug-reports: "https://github.com/avsm/mirage-ci/issues"
 tags: ["org:mirage" "org:ocamlabs"]
 depends: [
   "ocaml" {>= "4.03.0"}
-  "dune" {build & >= "1.0"}
-  "ppx_sexp_conv" {>="v0.9.0"}
+  "dune" {>= "1.0"}
+  "ppx_sexp_conv" {>= "v0.9.0"}
   "dockerfile-cmd"
   "datakit-ci" {>= "0.12.0"}
   "datakit-client" {>= "0.11.0"}

From ef99ac62084a68b3d7413805aae545d9f8f02f3e Mon Sep 17 00:00:00 2001
From: Kate <kit.ty.kate@disroot.org>
Date: Wed, 24 Jun 2020 19:52:57 +0100
Subject: [PATCH 2/4] Avoid the CI from crashing (see
 https://github.com/mirage/ocaml-conduit/pull/261 and
 https://github.com/mirage/ocaml-cohttp/pull/669)

---
 src-bin/opamRepoCI.ml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src-bin/opamRepoCI.ml b/src-bin/opamRepoCI.ml
index cc02cc2..7cbc3fc 100644
--- a/src-bin/opamRepoCI.ml
+++ b/src-bin/opamRepoCI.ml
@@ -10,6 +10,9 @@ open Datakit_ci
 open Term.Infix
 module DO = Docker_ops
 
+let () = Lwt.async_exception_hook := (fun exc ->
+  prerr_endline ("[Error caught in the Lwt.async_exception_hook]: "^Printexc.to_string exc))
+
 module Builder = struct
 
   let label = "opamRepo"

From f899f38e3ae60606f9e426e535f55186c3c6ee6c Mon Sep 17 00:00:00 2001
From: Kate <kit.ty.kate@disroot.org>
Date: Wed, 24 Jun 2020 22:08:04 +0100
Subject: [PATCH 3/4] Use datakit github bridge 1.0.0

---
 docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index c57bcea..17aff00 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -26,7 +26,7 @@ services:
     command: --git /data --listen-9p tcp://0.0.0.0:5640
   bridge:
     restart: always
-    image: datakit/github-bridge:0.11.0
+    image: datakit/github-bridge
     command: --datakit tcp://datakit:5640 -v -c "*:r" --webhook http://${CI_DOMAIN_NAME}:8100
     ports:
      - "8100:8100"

From 22146a072f79dde496eecb07ee480884072c1ee3 Mon Sep 17 00:00:00 2001
From: Kate <kit.ty.kate@disroot.org>
Date: Wed, 24 Jun 2020 22:29:42 +0100
Subject: [PATCH 4/4] Use datakit github bridge 1.0.0 (docker stack version)

---
 opam-repo-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/opam-repo-ci.yml b/opam-repo-ci.yml
index 714b86e..403d90e 100644
--- a/opam-repo-ci.yml
+++ b/opam-repo-ci.yml
@@ -31,7 +31,7 @@ services:
       - datakit-data:/data
     command: --git /data --listen-prometheus=9090 --listen-9p tcp://0.0.0.0:5640
   bridge:
-    image: datakit/github-bridge:0.11.0
+    image: datakit/github-bridge
     command: --listen-prometheus=9090 --datakit tcp://datakit:5640 -v -c "*:r,status[ci/datakit]:x,webhook:rw" --webhook http://ci.ocaml.org:8100
     ports:
      - "8100:8100"