ci: Use a variable for ephemeral packages

So that they only need to be listed once.

Acked-by: Olivier Fourdan <ofourdan@redhat.com>
This commit is contained in:
Michel Dänzer 2020-11-12 12:01:45 +01:00 committed by Michel Dänzer
parent 996ba1b99a
commit 8469935fe2

View File

@ -5,25 +5,31 @@ set -o xtrace
echo 'deb-src https://deb.debian.org/debian testing main' > /etc/apt/sources.list.d/deb-src.list echo 'deb-src https://deb.debian.org/debian testing main' > /etc/apt/sources.list.d/deb-src.list
apt-get update apt-get update
# Packages which are needed by this script, but not for the xserver build
EPHEMERAL="
git
libxkbcommon-dev
x11-utils
x11-xserver-utils
xauth
xvfb
"
apt-get install -y \ apt-get install -y \
$EPHEMERAL \
autoconf \ autoconf \
automake \ automake \
ca-certificates \ ca-certificates \
ccache \ ccache \
git \
libgl1 \ libgl1 \
libglx-mesa0 \ libglx-mesa0 \
libnvidia-egl-wayland-dev \ libnvidia-egl-wayland-dev \
libtool \ libtool \
libxkbcommon-dev \
meson \ meson \
python3-mako \ python3-mako \
python3-numpy \ python3-numpy \
python3-six \ python3-six
x11-utils \
x11-xserver-utils \
xauth \
xvfb \
apt-get build-dep -y xorg-server apt-get build-dep -y xorg-server
@ -52,11 +58,6 @@ find -name \*.a -o -name \*.o -o -name \*.c -o -name \*.h -o -name \*.la\* | xar
strip xts/xts5/*/.libs/* strip xts/xts5/*/.libs/*
apt-get purge -y \ apt-get purge -y \
git \ $EPHEMERAL
libxkbcommon-dev \
x11-utils \
x11-xserver-utils \
xauth \
xvfb \
apt-get autoremove -y --purge apt-get autoremove -y --purge