Mesa (master): gitlab-ci: Move down container_pre_build.sh invocation in x86_build.sh

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: f2773d706707b14f3285f337cfeb5e37b8a60385
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=f2773d706707b14f3285f337cfeb5e37b8a60385

Author: Michel Dänzer <mdaenzer at redhat.com>
Date:   Thu Apr 30 11:45:58 2020 +0200

gitlab-ci: Move down container_pre_build.sh invocation in x86_build.sh

It was in the middle of package installations.

Acked-by: Andres Gomez <agomez at igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4851>

---

 .gitlab-ci/container/x86_build.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci/container/x86_build.sh b/.gitlab-ci/container/x86_build.sh
index 428ae2123a2..13c95d37ac9 100644
--- a/.gitlab-ci/container/x86_build.sh
+++ b/.gitlab-ci/container/x86_build.sh
@@ -97,8 +97,6 @@ apt-get install -y --no-remove \
       xz-utils \
       zlib1g-dev
 
-. .gitlab-ci/container/container_pre_build.sh
-
 # Cross-build Mesa deps
 for arch in $CROSS_ARCHITECTURES; do
     apt-get install -y --no-remove \
@@ -133,6 +131,10 @@ apt-get install -y --no-remove \
       mingw-w64 \
       winehq-stable
 
+
+. .gitlab-ci/container/container_pre_build.sh
+
+
 # Debian's pkg-config wrapers for mingw are broken, and there's no sign that
 # they're going to be fixed, so we'll just have to fix it ourselves
 # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=930492