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@igalia.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4851>
This commit is contained in:
@@ -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
|
||||
|
Reference in New Issue
Block a user