From: Andres Gomez <tanty@igalia.com>
Date: Sat, 7 Mar 2020 23:32:17 +0000 (+0200)
Subject: gitlab-ci: Sort packages to install alphabetically
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=bbdf215fbd8bd3b48287079bb7b580aaa870ad2b;p=mesa.git

gitlab-ci: Sort packages to install alphabetically

Signed-off-by: Andres Gomez <agomez@igalia.com>
Reviewed-by: Eric Engestrom <eric@engestrom.ch>
Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
---

diff --git a/.gitlab-ci/container/x86_build_old.sh b/.gitlab-ci/container/x86_build_old.sh
index 906274527b9..96a75107a83 100644
--- a/.gitlab-ci/container/x86_build_old.sh
+++ b/.gitlab-ci/container/x86_build_old.sh
@@ -24,34 +24,34 @@ EOF
 apt-get dist-upgrade -y
 
 apt-get install -y --no-remove \
-      llvm-3.9-dev \
-      libclang-3.9-dev \
-      llvm-4.0-dev \
-      libclang-4.0-dev \
-      llvm-5.0-dev \
-      libclang-5.0-dev \
-      g++ \
+      bison \
       bzip2 \
       ccache \
-      zlib1g-dev \
-      pkg-config \
+      flex \
+      g++ \
       gcc \
+      gettext \
       git \
-      libepoxy-dev \
+      libclang-3.9-dev \
+      libclang-4.0-dev \
+      libclang-5.0-dev \
       libclc-dev \
-      xz-utils \
       libdrm-dev \
-      libexpat1-dev \
       libelf-dev \
-      libunwind-dev \
+      libepoxy-dev \
+      libexpat1-dev \
       libpng-dev \
+      libunwind-dev \
+      llvm-3.9-dev \
+      llvm-4.0-dev \
+      llvm-5.0-dev \
+      meson \
+      pkg-config \
       python-mako \
       python3-mako \
-      bison \
-      flex \
-      gettext \
       scons \
-      meson
+      xz-utils \
+      zlib1g-dev
 
 
 ############### Uninstall unused packages
diff --git a/.gitlab-ci/container/x86_test-gl.sh b/.gitlab-ci/container/x86_test-gl.sh
index b56eaa3aba7..2b94a2ef5c2 100644
--- a/.gitlab-ci/container/x86_test-gl.sh
+++ b/.gitlab-ci/container/x86_test-gl.sh
@@ -32,42 +32,42 @@ apt-get install -y --no-remove \
       automake \
       cmake \
       g++ \
+      gcc \
       git \
       git-lfs \
-      gcc \
       libexpat1 \
       libgbm-dev \
       libgles2-mesa-dev \
-      libpcre32-3 \
+      libllvm9 \
       libpcre3-dev \
-      libpng16-16 \
+      libpcre32-3 \
       libpng-dev \
+      libpng16-16 \
       libpython3.7 \
-      libvulkan1 \
       libvulkan-dev \
+      libvulkan1 \
       libwaffle-dev \
       libwayland-server0 \
       libxcb-keysyms1 \
       libxcb-keysyms1-dev \
       libxcb-xfixes0 \
-      libxkbcommon0 \
       libxkbcommon-dev \
-      libxrender1 \
+      libxkbcommon0 \
       libxrender-dev \
-      libllvm9 \
+      libxrender1 \
       make \
       meson \
       patch \
       pkg-config \
       python \
-      python3.7 \
-      python3.7-dev \
       python3-distutils \
       python3-mako \
       python3-numpy \
       python3-pil \
       python3-six \
       python3-yaml \
+      python3.7 \
+      python3.7-dev \
       qt5-default \
       qt5-qmake \
       waffle-utils \
@@ -118,7 +118,7 @@ apt-get purge -y \
       meson \
       patch \
       pkg-config \
-      python3.7-dev \
-      python3-distutils
+      python3-distutils \
+      python3.7-dev
 
 apt-get autoremove -y --purge
diff --git a/.gitlab-ci/container/x86_test-vk.sh b/.gitlab-ci/container/x86_test-vk.sh
index 36098c18384..9fca28e3b65 100644
--- a/.gitlab-ci/container/x86_test-vk.sh
+++ b/.gitlab-ci/container/x86_test-vk.sh
@@ -30,40 +30,40 @@ apt-get dist-upgrade -y
 apt-get install -y --no-remove \
       cmake \
       g++ \
+      gcc \
       git \
       git-lfs \
-      gcc \
       libexpat1 \
       libgbm-dev \
       libgles2-mesa-dev \
+      libllvm9 \
       liblz4-1 \
       liblz4-dev \
-      libpng16-16 \
       libpng-dev \
-      libvulkan1 \
+      libpng16-16 \
       libvulkan-dev \
+      libvulkan1 \
       libwayland-client0 \
       libwayland-server0 \
-      libxcb-ewmh2 \
       libxcb-ewmh-dev \
+      libxcb-ewmh2 \
       libxcb-keysyms1 \
       libxcb-keysyms1-dev \
       libxcb-randr0 \
       libxcb-xfixes0 \
-      libxkbcommon0 \
       libxkbcommon-dev \
-      libxrandr2 \
+      libxkbcommon0 \
       libxrandr-dev \
-      libxrender1 \
+      libxrandr2 \
       libxrender-dev \
-      libllvm9 \
+      libxrender1 \
       meson \
       patch \
       pkg-config \
+      python \
       python3-distutils \
       python3-pil \
       python3-yaml \
-      python \
       xauth \
       xvfb