Skip to content

Commit

Permalink
fix(CI): fix Dockerfile and client dependencies
Browse files Browse the repository at this point in the history
it's a bit annoying to have the client depend on asak just because of a datatype
that's not used, but fixing that would require some reorganisation.
  • Loading branch information
AltGr committed Jul 25, 2024
1 parent 50a979f commit 1b0c0e4
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 1 deletion.
1 change: 0 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@ COPY --from=compilation "$opam_switch/lib/gg" "$opam_switch/lib/gg"

# Fixes for ocamlfind
COPY --from=compilation "$opam_switch/lib/findlib.conf" "$opam_switch/lib/"
COPY --from=compilation "$opam_switch/lib/stdlib" "$opam_switch/lib/stdlib"
ENV PATH="${opam_switch}/bin:${PATH}"
ENV OCAMLPATH="/usr/lib"
RUN ln -sf "$opam_switch/lib/vg" "/usr/lib"
Expand Down
7 changes: 7 additions & 0 deletions learn-ocaml-client.opam
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ depends: [
"ppx_sexp_conv"
"ssl" {>= "0.5.12"}
"vg"
"asak" {>= "0.5"}
]
build: [
["dune" "build" "@install" "-p" name "-j" jobs]
Expand All @@ -53,3 +54,9 @@ description: """
This contains the binaries to interact with the learn-ocaml
platform from the command line.
"""
pin-depends: [
[
"asak.0.5"
"git+https://github.com/AltGr/asak#ocaml5"
]
]
4 changes: 4 additions & 0 deletions learn-ocaml-client.opam.locked
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ homepage: "https://github.com/ocaml-sf/learn-ocaml"
bug-reports: "https://github.com/ocaml-sf/learn-ocaml/issues"
depends: [
"angstrom" {= "0.15.0"}
"asak" {= "0.5"}
"asn1-combinators" {= "0.2.6"}
"astring" {= "0.8.5"}
"base" {= "v0.16.3"}
Expand Down Expand Up @@ -143,6 +144,9 @@ depends: [
build: ["dune" "build" "@install" "-p" name "-j" jobs]
dev-repo: "git+https://github.com/ocaml-sf/learn-ocaml"
pin-depends: [
["asak.0.5" "git+https://github.com/AltGr/asak#ocaml5"]
[
"ocp-indent-nlfork.1.5.5"
"git+https://git@github.com/OCamlPro/ocp-indent.git#nlfork"
]
]

0 comments on commit 1b0c0e4

Please sign in to comment.