CatalaLang/catala
1
1
Fork 0
mirror of https://github.com/CatalaLang/catala.git synced 2024-11-08 07:51:43 +03:00
Code Issues Projects Releases Wiki Activity

Update CI build

Browse Source
This commit is contained in:
Louis Gesbert 2023-08-01 16:51:39 +02:00
parent a29abb3e09
commit f35825a9c1
3 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Dockerfile
View File

@ -2,7 +2,7 @@
# STAGE 1: setup an opam switch with all dependencies installed # STAGE 1: setup an opam switch with all dependencies installed
# #
# (only depends on the opam files) # (only depends on the opam files)
FROM ocamlpro/ocaml:4.14-2023-06-18 AS dev-build-context FROM ocamlpro/ocaml:4.14-2023-08-01 AS dev-build-context
# Image from https://hub.docker.com/r/ocamlpro/ocaml # Image from https://hub.docker.com/r/ocamlpro/ocaml
RUN mkdir catala RUN mkdir catala
@ -25,19 +25,6 @@ RUN opam --cli=2.1 switch create catala ocaml-system && \
# Note: just `opam switch create . --deps-only --with-test --with-doc && opam clean` # Note: just `opam switch create . --deps-only --with-test --with-doc && opam clean`
# should be enough once opam 2.2 is released (see opam#5185) # should be enough once opam 2.2 is released (see opam#5185)
# Install extra dependencies not handled yet by the opam depexts
#
# python3, ninja (samurai in this case), etc. already got installed through opam's
# depext mechanism at this point -- see clerk.opam and catala.opam
#
# pandoc is not in alpine stable yet though, so install it manually with an explicit repository
RUN sudo apk add pandoc --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community/
# Workaround broken rescript build that recompiles its own version of
# ninja with a badly written script :[]
RUN sudo apk add pythonispython3
# #
# STAGE 2: get the whole repo, run checks and builds # STAGE 2: get the whole repo, run checks and builds
# #

6
catala.opam
View File

@ -71,10 +71,10 @@ build: [
] ]
dev-repo: "git+https://github.com/CatalaLang/catala.git" dev-repo: "git+https://github.com/CatalaLang/catala.git"
depexts: [ depexts: [
["groff" "colordiff" "latexmk" "python3-pip" "pandoc"] ["groff" "latexmk" "python3-pip" "pandoc"]
{cataladevmode & os-family = "debian"} {cataladevmode & os-family = "debian"}
["groff" "colordiff" "texlive" "texmf-dist-fontsextra" "texmf-dist-latexextra" "py3-pip" "py3-pygments"] ["groff" "texlive-xetex" "texmf-dist-latexextra" "texmf-dist-pictures" "py3-pip" "py3-pygments" "pandoc-cli"]
{cataladevmode & os-distribution = "alpine"} {cataladevmode & os-distribution = "alpine"}
["groff" "colordiff" "latex-mk" "python-pygments" "pandoc"] ["groff" "latex-mk" "python-pygments" "pandoc"]
{cataladevmode & os-family = "arch"} {cataladevmode & os-family = "arch"}
] ]

4
clerk.opam
View File

@ -38,4 +38,8 @@ dev-repo: "git+https://github.com/CatalaLang/catala.git"
depexts: [ depexts: [
["ninja-build"] {os-family = "debian"} ["ninja-build"] {os-family = "debian"}
["samurai"] {os-distribution = "alpine"} ["samurai"] {os-distribution = "alpine"}
["colordiff"] {cataladevmode &
(os-distribution = "alpine" |
os-family = "arch" |
os-family = "debian")}
] ]