diff options
| author | Eric Anholt <eric@anholt.net> | 2019-03-26 12:58:39 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2019-03-28 13:55:22 -0700 |
| commit | 8c1dac5f83fba8fcd51f68214c0c5cf5d14ed2a7 (patch) | |
| tree | 590966f3a77cfc55fe8abcd4187f31d2f005dba1 | |
| parent | 3f3c489e51e1b8a82adee9c7c5942dadf218b70d (diff) | |
gitlab-ci: Install Mesa so we can test glamor.
We need the DRI swrast driver (for GLX in vfb), and also libgl (for
libepoxy in glamor)
Signed-off-by: Eric Anholt <eric@anholt.net>
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | .gitlab-ci/debian-install.sh | 9 |
2 files changed, 8 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 267dc669c..4d076412b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -18,7 +18,7 @@ variables: DEBIAN_VERSION: testing-slim DEBIAN_EXEC: 'bash .gitlab-ci/debian-install.sh' - DEBIAN_TAG: "2019-03-27" + DEBIAN_TAG: "2019-03-27-2" IMAGE_LOCAL: "$CI_REGISTRY_IMAGE/debian/$DEBIAN_VERSION:$DEBIAN_TAG" include: diff --git a/.gitlab-ci/debian-install.sh b/.gitlab-ci/debian-install.sh index e8d53eee9..814f1ffc6 100644 --- a/.gitlab-ci/debian-install.sh +++ b/.gitlab-ci/debian-install.sh @@ -5,8 +5,13 @@ set -o xtrace echo 'deb-src https://deb.debian.org/debian testing main' > /etc/apt/sources.list.d/deb-src.list apt-get update -apt-get install -y meson git ca-certificates ccache cmake automake autoconf libtool libwaffle-dev \ - libxkbcommon-dev python3-mako python3-numpy python3-six x11-utils x11-xserver-utils xauth xvfb +apt-get install -y \ + meson git ca-certificates ccache cmake automake \ + autoconf libtool libwaffle-dev \ + libxkbcommon-dev python3-mako python3-numpy python3-six \ + x11-utils x11-xserver-utils xauth xvfb \ + libgl1 libglx-mesa0 + apt-get build-dep -y xorg-server cd /root |