Skip to content

Commit

Permalink
Temporarily disable CI for specific platforms issues
Browse files Browse the repository at this point in the history
  • Loading branch information
art-w committed Apr 12, 2024
1 parent 3fb0a99 commit c2c8d42
Show file tree
Hide file tree
Showing 9 changed files with 51 additions and 8 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/coverage.yml
Expand Up @@ -4,6 +4,7 @@ on:
push:
branches:
- main
- eio
pull_request:
schedule:
# Prime the caches every Monday
Expand Down Expand Up @@ -45,6 +46,7 @@ jobs:
#
# TODO: replace with `opam pin --with-version` when Opam 2.1 is
# available via `setup-ocaml`.
opam exec -- ocamlc -config
find . -maxdepth 1 -name '*.opam' -printf '%P\n' |\
cut -d. -f1 |\
xargs -I{} -n 1 opam pin add {}.dev ./ -n
Expand Down
10 changes: 10 additions & 0 deletions 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
13 changes: 12 additions & 1 deletion examples/dune
Expand Up @@ -62,4 +62,15 @@

(mdx
(files merkle_proofs.md)
(libraries irmin irmin-cli irmin-git.unix ppx_irmin))
(deps %{bin:irmin})
(libraries
irmin
irmin-cli
irmin-git
irmin-git.unix
eio
eio_main
eio.unix
lwt_eio)
(enabled_if
(<> %{model} "ppc64le")))
2 changes: 1 addition & 1 deletion examples/merkle_proofs.md
Expand Up @@ -7,12 +7,12 @@ More specifically, for Irmin, a Merkle proof is the subset of a tree stored in a
### Setting up a Bank

```ocaml
# #require "eio_main";;
# #require "digestif.ocaml";;
# #require "checkseum.ocaml";;
# #require "irmin";;
# #require "irmin-git.unix";;
# #require "ppx_irmin";;
# #require "eio_main";;
```

First, create an irmin-unix store module which uses `int` as contents.
Expand Down
8 changes: 6 additions & 2 deletions src/libirmin/lib/dune
Expand Up @@ -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)))
7 changes: 6 additions & 1 deletion test/irmin-client/dune
Expand Up @@ -8,4 +8,9 @@
websocket-lwt-unix
conduit-lwt-unix
irmin-test
irmin-watcher))
irmin-watcher)
; TODO: fix unix EMFILE error
(enabled_if
(and
(<> %{system} macosx)
(<> %{system} freebsd))))
7 changes: 6 additions & 1 deletion test/irmin-pack/dune
Expand Up @@ -48,7 +48,12 @@
;; 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
(and
(<> %{system} macosx)
(<> %{system} freebsd))))

(library
(name common)
Expand Down
6 changes: 5 additions & 1 deletion test/irmin-tezos/dune
Expand Up @@ -19,7 +19,11 @@
(deps
(file irmin_fsck.exe)
(file data)
(alias generate-cli-test-data)))
(alias generate-cli-test-data))
(enabled_if
(and
(<> %{system} macosx)
(<> %{system} freebsd))))

;FIXME: we should not depend on the version of cmdliner
;(rule
Expand Down
4 changes: 3 additions & 1 deletion test/libirmin/dune
Expand Up @@ -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)
Expand Down

0 comments on commit c2c8d42

Please sign in to comment.