From d1b79ef57b89bfc027f102f4f30d6266a3b239f3 Mon Sep 17 00:00:00 2001 From: Timothy Arceri Date: Mon, 12 Feb 2024 13:46:08 +1100 Subject: [PATCH] Revert "ci: Enable GALLIUM_DUMP_CPU=true only in the clang job" Rob worded it well in 9e8450b65ccc. "We don't want util_cpu to vomit cpu caps all over the test output." This reverts commit c6979d97e46907ff341665200b853cbca1d5524c. Reviewed-by: Eric Engestrom Part-of: (cherry picked from commit 62fa5c8d0f059ba75d7208a0d081da811065ba1c) --- .gitlab-ci/build/gitlab-ci.yml | 1 - .pick_status.json | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitlab-ci/build/gitlab-ci.yml b/.gitlab-ci/build/gitlab-ci.yml index 0c31760045a..f2897d06052 100644 --- a/.gitlab-ci/build/gitlab-ci.yml +++ b/.gitlab-ci/build/gitlab-ci.yml @@ -463,7 +463,6 @@ debian-clang: BUILDTYPE: debug LLVM_VERSION: 15 UNWIND: "enabled" - GALLIUM_DUMP_CPU: "true" C_ARGS: > -Wno-error=constant-conversion -Wno-error=enum-conversion diff --git a/.pick_status.json b/.pick_status.json index 1a74ee8dc1f..e21a08732a0 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1844,7 +1844,7 @@ "description": "Revert \"ci: Enable GALLIUM_DUMP_CPU=true only in the clang job\"", "nominated": true, "nomination_type": 2, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "c6979d97e46907ff341665200b853cbca1d5524c", "notes": null