KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ci: Fix meson-i386 build failed after libdrm bump version 

libpciaccess-dev:$arch from STABLE_EPHEMERAL down to the main list of packages
in .gitlab-ci/container/cross_build.sh, and bumping the arm_build, i386_build,
ppc64el_build & s390x_build tags again.

Signed-off-by: Leo Liu <leo.liu@amd.com>
Suggested-by: Michel Dänzer <mdaenzer@redhat.com>
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
----
 .gitlab-ci.yml                      | 8 ++++----
 .gitlab-ci/container/cross_build.sh | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10095>
This commit is contained in:
Leo Liu 2021-04-11 11:02:19 -04:00 committed by Marge Bot
parent 2c1e4c4baa
commit a99d77e5be
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.gitlab-ci.yml
View File

@ -330,7 +330,7 @@ i386_build:
extends:
- .use-x86_build-base
variables:
MESA_IMAGE_TAG: &i386_build "2021-04-08-libdrm"
MESA_IMAGE_TAG: &i386_build "2021-04-11-libdrm"
.use-i386_build:
extends:
@ -347,7 +347,7 @@ ppc64el_build:
extends:
- .use-x86_build-base
variables:
MESA_IMAGE_TAG: &ppc64el_build "2021-04-08-libdrm"
MESA_IMAGE_TAG: &ppc64el_build "2021-04-11-libdrm"
.use-ppc64el_build:
extends:
@ -364,7 +364,7 @@ s390x_build:
extends:
- .use-x86_build-base
variables:
MESA_IMAGE_TAG: &s390x_build "2021-04-08-libdrm"
MESA_IMAGE_TAG: &s390x_build "2021-04-11-libdrm"
.use-s390x_build:
extends:
@ -427,7 +427,7 @@ arm_build:
- .fdo.container-build@debian@arm64v8
- .container
variables:
MESA_IMAGE_TAG: &arm_build "2021-04-08-libdrm"
MESA_IMAGE_TAG: &arm_build "2021-04-11-libdrm"
.use-arm_build:
extends:

2
.gitlab-ci/container/cross_build.sh
View File

@ -7,7 +7,6 @@ export DEBIAN_FRONTEND=noninteractive
# Ephemeral packages (installed for this script and removed again at the end)
STABLE_EPHEMERAL=" \
libpciaccess-dev:$arch
"
dpkg --add-architecture $arch
@ -19,6 +18,7 @@ apt-get install -y --no-remove \
libelf-dev:$arch \
libexpat1-dev:$arch \
libffi-dev:$arch \
libpciaccess-dev:$arch \
libstdc++6:$arch \
libtinfo-dev:$arch \
libvulkan-dev:$arch \