OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gitlab-ci: install xmllint to validate 00-mesa-defaults.conf

Browse Source 
Signed-off-by: Eric Engestrom <eric.engestrom@intel.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
This commit is contained in:
Eric Engestrom
2019-02-27 09:48:46 +00:00
parent bb6b691c57
commit df5cd51259
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.yml
View File

@@ -16,7 +16,7 @@
# The format of the tag is "%Y-%m-%d-${counter}" where ${counter} stays # The format of the tag is "%Y-%m-%d-${counter}" where ${counter} stays
# at "01" unless you have multiple updates on the same day :) # at "01" unless you have multiple updates on the same day :)
variables: variables:
UBUNTU_TAG: 2019-02-12-01 UBUNTU_TAG: 2019-02-27-01
UBUNTU_IMAGE: "$CI_REGISTRY_IMAGE/ubuntu:$UBUNTU_TAG" UBUNTU_IMAGE: "$CI_REGISTRY_IMAGE/ubuntu:$UBUNTU_TAG"
UBUNTU_IMAGE_MAIN: "registry.freedesktop.org/mesa/mesa/ubuntu:$UBUNTU_TAG" UBUNTU_IMAGE_MAIN: "registry.freedesktop.org/mesa/mesa/ubuntu:$UBUNTU_TAG"

3
.gitlab-ci/Dockerfile.ubuntu
View File

@@ -161,5 +161,8 @@ RUN pip3 install mako
# Use ccache to speed up builds # Use ccache to speed up builds
RUN apt-get install -y ccache 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 # Cleanup workdir
WORKDIR / WORKDIR /