diff options
| author | Michel Dänzer <[email protected]> | 2020-04-30 11:45:58 +0200 |
|---|---|---|
| committer | Marge Bot <[email protected]> | 2020-05-14 12:54:09 +0000 |
| commit | f2773d706707b14f3285f337cfeb5e37b8a60385 (patch) | |
| tree | 15ca4511b4e009011152a00957a8dcc8ccf181d8 /.gitlab-ci/container | |
| parent | 1c79ac10690d1a2e44ea30a05542d0ea3f246a56 (diff) | |
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 <[email protected]>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4851>
Diffstat (limited to '.gitlab-ci/container')
| -rw-r--r-- | .gitlab-ci/container/x86_build.sh | 6 |
1 files 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 |