diff options
author | Eric Engestrom <[email protected]> | 2019-02-27 09:48:46 +0000 |
---|---|---|
committer | Eric Engestrom <[email protected]> | 2019-02-28 17:30:48 +0000 |
commit | df5cd512598ebcea153ba44f36787959e1e367c8 (patch) | |
tree | cf3abe224d4ec4aae07f2deb6a3b09a288c68bef | |
parent | bb6b691c574ecc891528947f92be227fb6bcf872 (diff) |
gitlab-ci: install xmllint to validate 00-mesa-defaults.conf
Signed-off-by: Eric Engestrom <[email protected]>
Reviewed-by: Emil Velikov <[email protected]>
-rw-r--r-- | .gitlab-ci.yml | 2 | ||||
-rw-r--r-- | .gitlab-ci/Dockerfile.ubuntu | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3cb16edccd0..bdb503251ab 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -16,7 +16,7 @@ # The format of the tag is "%Y-%m-%d-${counter}" where ${counter} stays # at "01" unless you have multiple updates on the same day :) variables: - UBUNTU_TAG: 2019-02-12-01 + UBUNTU_TAG: 2019-02-27-01 UBUNTU_IMAGE: "$CI_REGISTRY_IMAGE/ubuntu:$UBUNTU_TAG" UBUNTU_IMAGE_MAIN: "registry.freedesktop.org/mesa/mesa/ubuntu:$UBUNTU_TAG" diff --git a/.gitlab-ci/Dockerfile.ubuntu b/.gitlab-ci/Dockerfile.ubuntu index 77c15216951..d935e92768c 100644 --- a/.gitlab-ci/Dockerfile.ubuntu +++ b/.gitlab-ci/Dockerfile.ubuntu @@ -161,5 +161,8 @@ RUN pip3 install mako # Use ccache to speed up builds RUN apt-get install -y ccache +# We need xmllint to validate the XML files in Mesa +RUN apt-get install -y libxml2-utils + # Cleanup workdir WORKDIR / |