From a99d77e5beb21f1066a30bc9562e4402fc918571 Mon Sep 17 00:00:00 2001 From: Leo Liu Date: Sun, 11 Apr 2021 11:02:19 -0400 Subject: [PATCH] ci: Fix meson-i386 build failed after libdrm bump version MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Suggested-by: Michel Dänzer Reviewed-by: Michel Dänzer ---- .gitlab-ci.yml | 8 ++++---- .gitlab-ci/container/cross_build.sh | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) Part-of: --- .gitlab-ci.yml | 8 ++++---- .gitlab-ci/container/cross_build.sh | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ff3031b8e58..21e13dec080 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -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: diff --git a/.gitlab-ci/container/cross_build.sh b/.gitlab-ci/container/cross_build.sh index 15d28b1acc8..5f6c52381a3 100644 --- a/.gitlab-ci/container/cross_build.sh +++ b/.gitlab-ci/container/cross_build.sh @@ -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 \