Skip to contentSkip to conversation

CI: Add Ocaml to the alpine containers

PATCH In review Andrew Cooper 3 participants 4 messages Jun 9, 2023

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 CI: Add Ocaml to the alpine containers

This gets more coverage of optional parts of the build, and makes it easier to trial Ocaml related changes in the smoke tests.

---
CC: Roger Pau Monné <[email protected]>
CC: Stefano Stabellini <[email protected]>
CC: Michal Orzel <[email protected]>
CC: Anthony PERARD <[email protected]>

Hacked up manually to fix the Ocaml bindings for arm64:

https://gitlab.com/xen-project/people/andyhhp/xen/-/pipelines/895162017

but this aspect should be done irrespective.

---
 automation/build/alpine/3.12-arm64v8.dockerfile | 2 ++
 automation/build/alpine/3.12.dockerfile         | 2 ++
 2 files changed, 4 insertions(+)
automation/build/alpine/3.12-arm64v8.dockerfile +2 -0
index 3f1e6a3fc6df..1be3bf780509 100644
@@ -28,6 +28,8 @@ RUN apk --no-cache add \
   make \
   musl-dev  \
   ncurses-dev \
+  ocaml \
+  ocaml-findlib \
   patch  \
   python3-dev \
   texinfo \
automation/build/alpine/3.12.dockerfile +2 -0
index c847aa82d9e2..72ad3a07ad4a 100644
@@ -30,6 +30,8 @@ RUN apk --no-cache add \
   make \
   musl-dev  \
   ncurses-dev \
+  ocaml \
+  ocaml-findlib \
   patch  \
   python3-dev \
   texinfo \

base-commit: 3a82e4501c4ec4d53b764c5b69955997b03d1137

Signature · 1 line
2.30.2
Reviewed-by on v1 1/1
#1 lore raw
Quoted 27 lines · Andrew Cooper

This gets more coverage of optional parts of the build, and makes it easier to trial Ocaml related changes in the smoke tests.

---
CC: Roger Pau Monné <[email protected]>
CC: Stefano Stabellini <[email protected]>
CC: Michal Orzel <[email protected]>
CC: Anthony PERARD <[email protected]>

Hacked up manually to fix the Ocaml bindings for arm64:

https://gitlab.com/xen-project/people/andyhhp/xen/-/pipelines/895162017

but this aspect should be done irrespective.

---
 automation/build/alpine/3.12-arm64v8.dockerfile | 2 ++
 automation/build/alpine/3.12.dockerfile         | 2 ++
 2 files changed, 4 insertions(+)
automation/build/alpine/3.12-arm64v8.dockerfile +0 -0
index 3f1e6a3fc6df..1be3bf780509 100644

automation/build/alpine/3.12-arm64v8.dockerfile RUN apk --no-cache add \ · line 32

Quoted 5 lines
automation/build/alpine/3.12-arm64v8.dockerfile +2 -0
@@ -28,6 +28,8 @@ RUN apk --no-cache add \
   make \
   musl-dev  \
   ncurses-dev \
+  ocaml \
+  ocaml-findlib \

I can see that in your CI pipeline, this package is missing. Is it then necessary to be added? Asking just out of curiosity because other containers have it installed too.

Apart from that, I can confirm that containers can be built without issues, so:

~Michal

#2 lore raw
Quoted 34 lines · Michal Orzel
Quoted 25 lines · Andrew Cooper

This gets more coverage of optional parts of the build, and makes it easier to trial Ocaml related changes in the smoke tests.

---
CC: Roger Pau Monné <[email protected]>
CC: Stefano Stabellini <[email protected]>
CC: Michal Orzel <[email protected]>
CC: Anthony PERARD <[email protected]>

Hacked up manually to fix the Ocaml bindings for arm64:

https://gitlab.com/xen-project/people/andyhhp/xen/-/pipelines/895162017

but this aspect should be done irrespective.

---
 automation/build/alpine/3.12-arm64v8.dockerfile | 2 ++
 automation/build/alpine/3.12.dockerfile         | 2 ++
 2 files changed, 4 insertions(+)
automation/build/alpine/3.12-arm64v8.dockerfile +0 -0
index 3f1e6a3fc6df..1be3bf780509 100644

automation/build/alpine/3.12-arm64v8.dockerfile RUN apk --no-cache add \ · line 32

Quoted 5 lines
automation/build/alpine/3.12-arm64v8.dockerfile +2 -0
@@ -28,6 +28,8 @@ RUN apk --no-cache add \
   make \
   musl-dev  \
   ncurses-dev \
+  ocaml \
+  ocaml-findlib \

I can see that in your CI pipeline, this package is missing. Is it then necessary to be added? Asking just out of curiosity because other containers have it installed too.

Quoted 2 lines

Apart from that, I can confirm that containers can be built without issues, so:

Thanks.  It is necessary, yes.

I missed it the first time around, and deployed updated container to rerun the failed job, rather than pushing a full new branch.

I'm unsure why the opensuse containers have ocaml-ocamlbuild and ocaml-ocamldoc too, but that can be a mystery for another day.

~Andrew

#3 lore raw
In reply to Michal Orzel
Quoted 36 lines · Michal Orzel
Quoted 27 lines · Andrew Cooper

This gets more coverage of optional parts of the build, and makes it easier to trial Ocaml related changes in the smoke tests.

---
CC: Roger Pau Monné <[email protected]>
CC: Stefano Stabellini <[email protected]>
CC: Michal Orzel <[email protected]>
CC: Anthony PERARD <[email protected]>

Hacked up manually to fix the Ocaml bindings for arm64:

https://gitlab.com/xen-project/people/andyhhp/xen/-/pipelines/895162017

but this aspect should be done irrespective.

---
 automation/build/alpine/3.12-arm64v8.dockerfile | 2 ++
 automation/build/alpine/3.12.dockerfile         | 2 ++
 2 files changed, 4 insertions(+)
automation/build/alpine/3.12-arm64v8.dockerfile +0 -0
index 3f1e6a3fc6df..1be3bf780509 100644

automation/build/alpine/3.12-arm64v8.dockerfile RUN apk --no-cache add \ · line 32

Quoted 5 lines
automation/build/alpine/3.12-arm64v8.dockerfile +2 -0
@@ -28,6 +28,8 @@ RUN apk --no-cache add \
   make \
   musl-dev  \
   ncurses-dev \
+  ocaml \
+  ocaml-findlib \

I can see that in your CI pipeline, this package is missing. Is it then necessary to be added? Asking just out of curiosity because other containers have it installed too.

Quoted 2 lines

Apart from that, I can confirm that containers can be built without issues, so: