From 3a35bbc5b831c48754b31de74a47d52adb419948 Mon Sep 17 00:00:00 2001 From: Shon Feder Date: Fri, 5 Jul 2024 13:00:51 -0400 Subject: [PATCH 1/3] Ignore _opam --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 863fce3..a300cda 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ _build .merlin *.install /var/ +_opam/ From aa1c9dca43d66c1bb9ae1f93d08436cc708175d0 Mon Sep 17 00:00:00 2001 From: Shon Feder Date: Fri, 5 Jul 2024 13:01:04 -0400 Subject: [PATCH 2/3] Add dependency on prometheus-app Required by dune-opam-lint --- deployer.opam | 1 + dune-project | 1 + 2 files changed, 2 insertions(+) diff --git a/deployer.opam b/deployer.opam index 87d14fc..386815f 100644 --- a/deployer.opam +++ b/deployer.opam @@ -34,6 +34,7 @@ depends: [ "current_slack" "current_ssh" "ocluster-api" + "prometheus-app" {>= "1.2"} "capnp-rpc-unix" "fmt" "ppx_deriving_yojson" diff --git a/dune-project b/dune-project index 967625e..8ac6a4c 100644 --- a/dune-project +++ b/dune-project @@ -20,6 +20,7 @@ current_ssh ocluster-api ; Opam dependencies + (prometheus-app (>= 1.2)) capnp-rpc-unix fmt ppx_deriving_yojson From de25a03eefd324e3c06ed36f6f650f1bddc696f9 Mon Sep 17 00:00:00 2001 From: Shon Feder Date: Fri, 5 Jul 2024 13:11:20 -0400 Subject: [PATCH 3/3] Mark incompatibility with debian 12 on x68_32 --- deployer.opam | 2 ++ deployer.opam.template | 2 ++ 2 files changed, 4 insertions(+) create mode 100644 deployer.opam.template diff --git a/deployer.opam b/deployer.opam index 386815f..0564195 100644 --- a/deployer.opam +++ b/deployer.opam @@ -61,3 +61,5 @@ build: [ ] ] dev-repo: "git+https://github.com/ocurrent/ocurrent-deployer.git" +# See https://github.com/ocurrent/ocaml-ci/issues/931 +available: !(os-distribution = "debian" & os-version = "12" & arch = "x86_32") diff --git a/deployer.opam.template b/deployer.opam.template new file mode 100644 index 0000000..c664ab3 --- /dev/null +++ b/deployer.opam.template @@ -0,0 +1,2 @@ +# See https://github.com/ocurrent/ocaml-ci/issues/931 +available: !(os-distribution = "debian" & os-version = "12" & arch = "x86_32")