From 74f7b370eabdfb4f575c7f34acefb54f470952e2 Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Wed, 28 Aug 2024 17:42:33 +0200 Subject: [PATCH] ci/build: untangle debian-s390x from debian-ppc64el The only thing inherited and not overridden was the `BUILDTYPE: debug`. Part-of: --- .gitlab-ci/build/gitlab-ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci/build/gitlab-ci.yml b/.gitlab-ci/build/gitlab-ci.yml index b810f2d8c68..4cf61d9a049 100644 --- a/.gitlab-ci/build/gitlab-ci.yml +++ b/.gitlab-ci/build/gitlab-ci.yml @@ -695,11 +695,12 @@ debian-x86_32: # In case of issues with this job, contact @ajax debian-s390x: extends: - - debian-ppc64el + - .meson-cross - .use-debian/s390x_build tags: - kvm variables: + BUILDTYPE: debug CROSS: s390x GALLIUM_DRIVERS: "llvmpipe,zink" LLVM_VERSION: 15