From 37c22dd403c01b50539d58d7f97a8170d3688b09 Mon Sep 17 00:00:00 2001 From: Daniel Stone Date: Mon, 2 Sep 2024 12:21:21 +0100 Subject: [PATCH] ci: Bring back shader-db and drop LTO This was the only thing running shellcheck and pytest. Unsurprisingly, tons of them regressed whilst it was gone. Since these have now been moved to other jobs, we can just bring back debian-build-testing in the non-critical-path stage if we drop LTO, so let's do that as there hasn't been any movement towards fixing it. Signed-off-by: Daniel Stone Part-of: --- .gitlab-ci/build/gitlab-ci.yml | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci/build/gitlab-ci.yml b/.gitlab-ci/build/gitlab-ci.yml index 267de17adc5..73d329498d2 100644 --- a/.gitlab-ci/build/gitlab-ci.yml +++ b/.gitlab-ci/build/gitlab-ci.yml @@ -178,9 +178,7 @@ debian-testing-msan: -D intel-clc=enabled -D install-intel-clc=true -# Disabled because it is unacceptably slow and blocks too many MRs -# Should be re-enabled once this problem has been fixed. -.debian-build-testing: +debian-build-testing: extends: .meson-build needs: - !reference [.meson-build, needs] @@ -208,7 +206,6 @@ debian-testing-msan: -D spirv-to-dxil=true -D osmesa=true -D tools=drm-shim,etnaviv,freedreno,glsl,intel,intel-ui,nir,nouveau,lima,panfrost,asahi - -D b_lto=true LLVM_VERSION: 15 S3_ARTIFACT_NAME: debian-build-testing script: | @@ -216,14 +213,13 @@ debian-testing-msan: .gitlab-ci/prepare-artifacts.sh timeout: 15m -# Disabled because it currently needs debian-build-testing -.shader-db: +shader-db: stage: code-validation extends: - .use-debian/x86_64_build - .container+build-rules needs: - - .debian-build-testing + - debian-build-testing variables: S3_ARTIFACT_NAME: debian-build-testing before_script: