From: Andrew Cooper <andrew.cooper3@citrix.com>
To: Xen-devel <xen-devel@lists.xenproject.org>
Cc: "Andrew Cooper" <andrew.cooper3@citrix.com>,
"Roger Pau Monné" <roger.pau@citrix.com>,
"Stefano Stabellini" <sstabellini@kernel.org>,
"Michal Orzel" <michal.orzel@amd.com>,
"Anthony PERARD" <anthony.perard@citrix.com>
Subject: [PATCH] CI: Add Ocaml to the alpine containers
Date: Fri, 9 Jun 2023 17:02:44 +0100 [thread overview]
Message-ID: <20230609160244.2638438-1-andrew.cooper3@citrix.com> (raw)
This gets more coverage of optional parts of the build, and makes it easier to
trial Ocaml related changes in the smoke tests.
Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
---
CC: Roger Pau Monné <roger.pau@citrix.com>
CC: Stefano Stabellini <sstabellini@kernel.org>
CC: Michal Orzel <michal.orzel@amd.com>
CC: Anthony PERARD <anthony.perard@citrix.com>
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(+)
diff --git a/automation/build/alpine/3.12-arm64v8.dockerfile b/automation/build/alpine/3.12-arm64v8.dockerfile
index 3f1e6a3fc6df..1be3bf780509 100644
--- a/automation/build/alpine/3.12-arm64v8.dockerfile
+++ b/automation/build/alpine/3.12-arm64v8.dockerfile
@@ -28,6 +28,8 @@ RUN apk --no-cache add \
make \
musl-dev \
ncurses-dev \
+ ocaml \
+ ocaml-findlib \
patch \
python3-dev \
texinfo \
diff --git a/automation/build/alpine/3.12.dockerfile b/automation/build/alpine/3.12.dockerfile
index c847aa82d9e2..72ad3a07ad4a 100644
--- a/automation/build/alpine/3.12.dockerfile
+++ b/automation/build/alpine/3.12.dockerfile
@@ -30,6 +30,8 @@ RUN apk --no-cache add \
make \
musl-dev \
ncurses-dev \
+ ocaml \
+ ocaml-findlib \
patch \
python3-dev \
texinfo \
base-commit: 3a82e4501c4ec4d53b764c5b69955997b03d1137
--
2.30.2
next reply other threads:[~2023-06-09 16:03 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-09 16:02 Andrew Cooper [this message]
2023-06-09 16:21 ` [PATCH] CI: Add Ocaml to the alpine containers Michal Orzel
2023-06-09 16:31 ` Andrew Cooper
2023-06-09 17:25 ` Stefano Stabellini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230609160244.2638438-1-andrew.cooper3@citrix.com \
--to=andrew.cooper3@citrix.com \
--cc=anthony.perard@citrix.com \
--cc=michal.orzel@amd.com \
--cc=roger.pau@citrix.com \
--cc=sstabellini@kernel.org \
--cc=xen-devel@lists.xenproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).