diff options
| author | Cristian Ciocaltea <cristian.ciocaltea@collabora.com> | 2021-12-31 14:41:41 +0200 |
|---|---|---|
| committer | Marge Bot <emma+marge@anholt.net> | 2022-01-18 18:42:05 +0000 |
| commit | c74fb1da4f40d3ea8da5a4a4a28e575139c51558 (patch) | |
| tree | 333f899705e53b9ab13d903fc857a7fd98510f8f /.gitlab-ci | |
| parent | 8729c6e98186b2feab4466ca288876e3a1078f6c (diff) | |
ci: Do not remove cmake
In order to enable container reuse in Virgl CI, keep 'cmake' in the
container.
Additionally, provide the 'check' utility.
Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
Reviewed-by: Rohan Garg <rohan.garg@intel.com>
Reviewed-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14413>
Diffstat (limited to '.gitlab-ci')
| -rw-r--r-- | .gitlab-ci/container/debian/x86_build.sh | 3 | ||||
| -rw-r--r-- | .gitlab-ci/image-tags.yml | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/.gitlab-ci/container/debian/x86_build.sh b/.gitlab-ci/container/debian/x86_build.sh index db631b3aeaa..7eb3a6a3d4d 100644 --- a/.gitlab-ci/container/debian/x86_build.sh +++ b/.gitlab-ci/container/debian/x86_build.sh @@ -11,7 +11,6 @@ STABLE_EPHEMERAL=" \ automake \ autotools-dev \ bzip2 \ - cmake \ libtool \ python3-pip \ " @@ -22,7 +21,9 @@ apt-get update apt-get install -y --no-remove \ $STABLE_EPHEMERAL \ + check \ clang \ + cmake \ libasan6 \ libarchive-dev \ libclang-cpp11-dev \ diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml index 22361523ffa..36185a77d00 100644 --- a/.gitlab-ci/image-tags.yml +++ b/.gitlab-ci/image-tags.yml @@ -3,7 +3,7 @@ variables: DEBIAN_BASE_TAG: "2022-01-02-deqp-runner" DEBIAN_X86_BUILD_IMAGE_PATH: "debian/x86_build" - DEBIAN_BUILD_TAG: "2021-12-31-refactor" + DEBIAN_BUILD_TAG: "2021-12-31-keep-cmake" DEBIAN_X86_TEST_BASE_IMAGE: "debian/x86_test-base" |