From: Arkadiusz Hiler <arkadiusz.hiler@intel.com>
To: igt-dev@lists.freedesktop.org
Cc: Petri Latvala <petri.latvala@intel.com>, Daniel Vetter <daniel@ffwll.ch>
Subject: [igt-dev] [PATCH i-g-t 4/4] gitlab-ci: Do meson build with oldest supported meson
Date: Wed, 24 Oct 2018 16:00:04 +0300 [thread overview]
Message-ID: <20181024130004.12770-4-arkadiusz.hiler@intel.com> (raw)
In-Reply-To: <20181024130004.12770-1-arkadiusz.hiler@intel.com>
Documentation building differs for meson < 0.47, so let's make sure that
it works.
Also remove a comment that has slipped through.
Signed-off-by: Arkadiusz Hiler <arkadiusz.hiler@intel.com>
---
.gitlab-ci.yml | 11 ++++++++++-
Dockerfile.fedora | 8 ++++++++
2 files changed, 18 insertions(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1814d8b6..bd1ddb79 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -21,13 +21,22 @@ stages:
build:tests-fedora:
stage: build
script:
- # Feodora does not have peg packaged
- meson $MESON_OPTIONS build
- ninja -C build
artifacts:
paths:
- build
+# documentation building is different with meson<0.47
+build:tests-fedora-oldest-meson:
+ stage: build
+ script:
+ - dnf remove -y meson
+ - pip3 install /usr/src/meson-*.tar.gz
+ - meson $MESON_OPTIONS build
+ - ninja -C build
+ - ninja -C build igt-gpu-tools-doc
+
build:tests-debian-meson:
image: $CI_REGISTRY/$CI_PROJECT_PATH/igt-debian:latest
stage: build
diff --git a/Dockerfile.fedora b/Dockerfile.fedora
index 341a0ed7..652a36c3 100644
--- a/Dockerfile.fedora
+++ b/Dockerfile.fedora
@@ -10,6 +10,7 @@ RUN dnf install -y gcc \
kmod-devel \
glib2-devel \
cairo-devel \
+ ninja-build \
procps-devel \
pixman-devel \
json-c-devel \
@@ -34,3 +35,10 @@ RUN curl -O http://piumarta.com/software/peg/peg-0.1.18.tar.gz
RUN tar xf peg-0.1.18.tar.gz
RUN cd peg-0.1.18 && make PREFIX=/usr install
RUN rm -fr /tmp/peg
+
+# Meson version switching shenanigans
+WORKDIR /usr/src
+RUN curl -O https://files.pythonhosted.org/packages/c0/98/bcbda7862f8ca18dbdaa57b9c51cf7333cdc59b48278ed279217cd6ad8ff/meson-0.44.0.tar.gz
+
+# Cleanup workdir
+WORKDIR /
--
2.17.2
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
next prev parent reply other threads:[~2018-10-24 13:00 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-24 13:00 [igt-dev] [PATCH i-g-t 1/4] gitlab-ci: Parametrize images used with CI_ variables Arkadiusz Hiler
2018-10-24 13:00 ` [igt-dev] [PATCH i-g-t 2/4] gitlab-ci: Compile using autotools Arkadiusz Hiler
2018-10-24 13:07 ` Daniel Vetter
2018-10-24 16:15 ` Arkadiusz Hiler
2018-10-24 13:00 ` [igt-dev] [PATCH i-g-t 3/4] gitlab-ci: Compare test-list.txt(s) generated by meson and autotools Arkadiusz Hiler
2018-10-24 13:00 ` Arkadiusz Hiler [this message]
2018-10-24 13:07 ` [igt-dev] [PATCH i-g-t 4/4] gitlab-ci: Do meson build with oldest supported meson Daniel Vetter
2018-10-24 17:58 ` [igt-dev] ✗ Fi.CI.BAT: failure for series starting with [i-g-t,1/4] gitlab-ci: Parametrize images used with CI_ variables Patchwork
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=20181024130004.12770-4-arkadiusz.hiler@intel.com \
--to=arkadiusz.hiler@intel.com \
--cc=daniel@ffwll.ch \
--cc=igt-dev@lists.freedesktop.org \
--cc=petri.latvala@intel.com \
/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