From ae400553fbb1a9ca2add87072f7dd61621e69111 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Michel=20D=C3=A4nzer?= Date: Tue, 2 Jun 2020 10:53:07 +0200 Subject: [PATCH] gitlab-ci: Move meson back to x86_test-gl/vk ephemeral packages lists And python3-distutils back to x86_test-gl's list. These are not used for building Mesa, only for other components used in test jobs. This partially reverts commit c1a290bdd57536d6afcff6a02f1512fba7328729 "meson: Bump required version to 0.52.0". Reviewed-by: Erik Faye-Lund Reviewed-by: Eric Anholt Part-of: --- .gitlab-ci/container/x86_test-base.sh | 4 ---- .gitlab-ci/container/x86_test-gl.sh | 2 ++ .gitlab-ci/container/x86_test-vk.sh | 1 + 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci/container/x86_test-base.sh b/.gitlab-ci/container/x86_test-base.sh index 82be74c4a42..4d631f8ea48 100644 --- a/.gitlab-ci/container/x86_test-base.sh +++ b/.gitlab-ci/container/x86_test-base.sh @@ -39,7 +39,6 @@ apt-get install -y --no-remove \ libxrandr2 \ libxrender1 \ python \ - python3-distutils \ python3-mako \ python3-numpy \ python3-pil \ @@ -59,7 +58,4 @@ apt-get install -y --no-remove \ apt-get purge -y \ gnupg -apt-get install -t buster-backports -y --no-remove \ - meson - apt-get autoremove -y --purge diff --git a/.gitlab-ci/container/x86_test-gl.sh b/.gitlab-ci/container/x86_test-gl.sh index 38e6e1e57e7..daed59c6d33 100644 --- a/.gitlab-ci/container/x86_test-gl.sh +++ b/.gitlab-ci/container/x86_test-gl.sh @@ -22,8 +22,10 @@ STABLE_EPHEMERAL=" \ libxkbcommon-dev \ libxrender-dev \ make \ + meson \ patch \ pkg-config \ + python3-distutils \ python3.7-dev \ wget \ xz-utils \ diff --git a/.gitlab-ci/container/x86_test-vk.sh b/.gitlab-ci/container/x86_test-vk.sh index 204acc01398..4f8f306ee9f 100644 --- a/.gitlab-ci/container/x86_test-vk.sh +++ b/.gitlab-ci/container/x86_test-vk.sh @@ -20,6 +20,7 @@ STABLE_EPHEMERAL=" \ libxkbcommon-dev \ libxrandr-dev \ libxrender-dev \ + meson \ p7zip \ pkg-config \ python3-distutils \ -- 2.30.2