From e3711a8d59a761704784b99428106ff92f87a997 Mon Sep 17 00:00:00 2001 From: Matthew Wang Date: Thu, 5 Oct 2023 10:17:24 -0700 Subject: [PATCH] Remove redundant `dune-project` constraint, use template for `z-ci-accept-failures` --- dune-project | 2 +- rsdd.opam | 5 ++++- rsdd.opam.template | 3 +++ 3 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 rsdd.opam.template diff --git a/dune-project b/dune-project index d0aca80..042bd78 100644 --- a/dune-project +++ b/dune-project @@ -15,5 +15,5 @@ (source (github neuppl/rsdd-ocaml)) (depends (ocaml (and (>= "4.08.0") (< "5"))) - (dune (>= "2.7")) + dune conf-rust-2021)) diff --git a/rsdd.opam b/rsdd.opam index 3f42843..ae8e97f 100644 --- a/rsdd.opam +++ b/rsdd.opam @@ -14,7 +14,7 @@ homepage: "https://github.com/neuppl/rsdd-ocaml" bug-reports: "https://github.com/neuppl/rsdd-ocaml/issues" depends: [ "ocaml" {>= "4.08.0" & < "5"} - "dune" {>= "2.7" & >= "2.7"} + "dune" {>= "2.7"} "conf-rust-2021" "odoc" {with-doc} ] @@ -33,3 +33,6 @@ build: [ ] ] dev-repo: "git+https://github.com/neuppl/rsdd-ocaml.git" +x-ci-accept-failures: [ + "freebsd" # cargo (and thus conf-rust-2021) is not available +] diff --git a/rsdd.opam.template b/rsdd.opam.template new file mode 100644 index 0000000..6d2c6d2 --- /dev/null +++ b/rsdd.opam.template @@ -0,0 +1,3 @@ +x-ci-accept-failures: [ + "freebsd" # cargo (and thus conf-rust-2021) is not available +]