Skip to content

Commit

Permalink
Add deriving opam packages back (#51)
Browse files Browse the repository at this point in the history
* Add deriving opam packages back

* Set ocaml version to 5.1
  • Loading branch information
georgyo committed Dec 5, 2023
1 parent e41546c commit 8068a98
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
10 changes: 5 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM ocaml/opam:alpine-3.18-ocaml-5.2 AS builder
FROM ocaml/opam:alpine-3.18-ocaml-5.1 AS builder

ENV PATH="/home/opam/.opam/5.2/bin:${PATH}"
ENV PATH="/home/opam/.opam/5.1/bin:${PATH}"

# We purposefully don't combine the opam update and opam install steps
# to allow the opam update layer to be re-used in the runner image below
Expand All @@ -11,12 +11,12 @@ WORKDIR /opt/test-runner
COPY runner/ .
RUN dune build

FROM ocaml/opam:alpine-3.18-ocaml-5.2 AS runner
FROM ocaml/opam:alpine-3.18-ocaml-5.1 AS runner

ENV PATH="/home/opam/.opam/5.2/bin:${PATH}"
ENV PATH="/home/opam/.opam/5.1/bin:${PATH}"

RUN opam update
RUN opam install base ounit2 qcheck react calendar
RUN opam install base dune ounit2 ppx_deriving ppx_sexp_conv qcheck react calendar

WORKDIR /opt/test-runner

Expand Down
2 changes: 1 addition & 1 deletion tests/example-empty-file/expected_results.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"version": 2,
"status": "error",
"message": "File \"leap.ml\", line 1:\nError: The implementation \"leap.ml\" does not match the interface \"leap.ml\": \n The value \"leap_year\" is required but not provided\n File \"leap.mli\", line 1, characters 0-26: Expected declaration\nmake: *** [Makefile:4: test] Error 1",
"message": "File \"leap.ml\", line 1:\nError: The implementation leap.ml\n does not match the interface .test.eobjs/byte/leap.cmi: \n The value `leap_year' is required but not provided\n File \"leap.mli\", line 1, characters 0-26: Expected declaration\nmake: *** [Makefile:4: test] Error 1",
"tests": null
}

0 comments on commit 8068a98

Please sign in to comment.