From 9d6bafde53a315151f04112bd76f5f164e9515a0 Mon Sep 17 00:00:00 2001 From: ArthurW Date: Fri, 12 Apr 2024 14:24:07 +0200 Subject: [PATCH] Temporarily disable CI for specific platforms issues --- .github/workflows/coverage.yml | 1 + bench.Dockerfile | 10 ++++++++++ examples/dune | 5 ++++- src/libirmin/lib/dune | 8 ++++++-- test/irmin-client/dune | 5 ++++- test/irmin-pack/dune | 5 ++++- test/irmin-tezos/dune | 4 +++- test/libirmin/dune | 4 +++- 8 files changed, 35 insertions(+), 7 deletions(-) create mode 100644 bench.Dockerfile diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 69194a46ccd..01170df28fa 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -4,6 +4,7 @@ on: push: branches: - main + - eio pull_request: schedule: # Prime the caches every Monday diff --git a/bench.Dockerfile b/bench.Dockerfile new file mode 100644 index 00000000000..6128f445e32 --- /dev/null +++ b/bench.Dockerfile @@ -0,0 +1,10 @@ +FROM ocaml/opam:debian-ocaml-5.1 +RUN sudo ln -sf /usr/bin/opam-2.1 /usr/bin/opam +WORKDIR bench-dir +RUN sudo chown opam . +COPY *.opam ./ +RUN opam remote add origin https://github.com/ocaml/opam-repository.git && opam update +RUN opam pin -yn --with-version=dev . +RUN opam install -y --deps-only --with-test . +COPY . ./ +RUN make bench diff --git a/examples/dune b/examples/dune index 28f453fd479..7961ae4d730 100644 --- a/examples/dune +++ b/examples/dune @@ -62,4 +62,7 @@ (mdx (files merkle_proofs.md) - (libraries irmin irmin-cli irmin-git.unix ppx_irmin)) + (package irmin-cli) + (libraries irmin irmin-cli irmin-git.unix ppx_irmin) + (enabled_if + (<> %{model} "ppc64le"))) diff --git a/src/libirmin/lib/dune b/src/libirmin/lib/dune index 5664d7a29ba..be7d224bbfa 100644 --- a/src/libirmin/lib/dune +++ b/src/libirmin/lib/dune @@ -14,11 +14,15 @@ (language c) (names irmin)) (flags - (:standard -w -unused-var-strict -ccopt "-Wl,-znow"))) + (:standard -w -unused-var-strict -ccopt "-Wl,-znow")) + (enabled_if + (<> %{ocaml_version} 5.2.0~alpha1))) (install (package libirmin) (section lib) (files (irmin.h as include/irmin.h) - (libirmin%{ext_dll} as lib/libirm%{ext_dll}))) + (libirmin%{ext_dll} as lib/libirm%{ext_dll})) + (enabled_if + (<> %{ocaml_version} 5.2.0~alpha1))) diff --git a/test/irmin-client/dune b/test/irmin-client/dune index e3734859743..a6fdf553fb8 100644 --- a/test/irmin-client/dune +++ b/test/irmin-client/dune @@ -8,4 +8,7 @@ websocket-lwt-unix conduit-lwt-unix irmin-test - irmin-watcher)) + irmin-watcher) + ; TODO: fix unix EMFILE error + (enabled_if + (<> %{system} macosx))) diff --git a/test/irmin-pack/dune b/test/irmin-pack/dune index 6b3f9163392..12786579e4e 100644 --- a/test/irmin-pack/dune +++ b/test/irmin-pack/dune @@ -48,7 +48,10 @@ ;; Attached to `irmin-tezos` to avoid a cyclic dependency with `irmin-pack` (package irmin-tezos) (action - (run ./test.exe -q --color=always))) + (run ./test.exe -q --color=always)) + ; TODO: Fix unix waitpid error in irmin-pack GC + (enabled_if + (<> %{system} macosx))) (library (name common) diff --git a/test/irmin-tezos/dune b/test/irmin-tezos/dune index e716cc75ef5..5f96883c0dc 100644 --- a/test/irmin-tezos/dune +++ b/test/irmin-tezos/dune @@ -19,7 +19,9 @@ (deps (file irmin_fsck.exe) (file data) - (alias generate-cli-test-data))) + (alias generate-cli-test-data)) + (enabled_if + (<> %{system} macosx))) ;FIXME: we should not depend on the version of cmdliner ;(rule diff --git a/test/libirmin/dune b/test/libirmin/dune index d71a6fa7822..e6f92990418 100644 --- a/test/libirmin/dune +++ b/test/libirmin/dune @@ -8,7 +8,9 @@ (setenv LD_LIBRARY_PATH ../../src/libirmin/lib - (run ./test.exe))))) + (run ./test.exe)))) + (enabled_if + (<> %{ocaml_version} 5.2.0~alpha1))) (rule (targets test.exe)