gitlab-ci: Move meson back to x86_test-gl/vk ephemeral packages lists
authorMichel Dänzer <mdaenzer@redhat.com>
Tue, 2 Jun 2020 08:53:07 +0000 (10:53 +0200)
committerEric Anholt <eric@anholt.net>
Tue, 2 Jun 2020 17:07:10 +0000 (10:07 -0700)
commitae400553fbb1a9ca2add87072f7dd61621e69111
tree2f95b85bfb203c99883cbafdf46a9bf61d813193
parentb19c094dbafbaf60568a3fb01a05372fc6a9ae11
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 <erik.faye-lund@collabora.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5296>
.gitlab-ci/container/x86_test-base.sh
.gitlab-ci/container/x86_test-gl.sh
.gitlab-ci/container/x86_test-vk.sh