diff options
| author | Michel Dänzer <mdaenzer@redhat.com> | 2020-11-12 12:01:45 +0100 |
|---|---|---|
| committer | Michel Dänzer <michel@daenzer.net> | 2020-11-17 18:18:20 +0100 |
| commit | 8469935fe26659219560f425c7b35d564ad77324 (patch) | |
| tree | b56fd2b7c8a6acafa2b91867e628d20e560956b0 /.gitlab-ci | |
| parent | 996ba1b99a7212471d3c24359056c412de70c28d (diff) | |
ci: Use a variable for ephemeral packages
So that they only need to be listed once.
Acked-by: Olivier Fourdan <ofourdan@redhat.com>
Diffstat (limited to '.gitlab-ci')
| -rw-r--r-- | .gitlab-ci/debian-install.sh | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/.gitlab-ci/debian-install.sh b/.gitlab-ci/debian-install.sh index c204760da..3454c8089 100644 --- a/.gitlab-ci/debian-install.sh +++ b/.gitlab-ci/debian-install.sh @@ -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 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 \ + $EPHEMERAL \ autoconf \ automake \ ca-certificates \ ccache \ - git \ libgl1 \ libglx-mesa0 \ libnvidia-egl-wayland-dev \ libtool \ - libxkbcommon-dev \ meson \ python3-mako \ python3-numpy \ - python3-six \ - x11-utils \ - x11-xserver-utils \ - xauth \ - xvfb \ + python3-six 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/* apt-get purge -y \ - git \ - libxkbcommon-dev \ - x11-utils \ - x11-xserver-utils \ - xauth \ - xvfb \ + $EPHEMERAL apt-get autoremove -y --purge |