Module: Mesa Branch: main Commit: 0e481bf4632b4c6b900d8e3f4b95dc83a5c93679 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=0e481bf4632b4c6b900d8e3f4b95dc83a5c93679
Author: Alyssa Rosenzweig <aly...@rosenzweig.io> Date: Fri Nov 3 09:47:11 2023 -0400 ci: Opt out asahi from clang-format I'm still 100% a believer in clang-format enforcement, but given the difficult constraints upstream CI has, I no longer believe it is productive or fair to do this enforcement upstream. Instead, it can be (and effectively is) enforced much more inexpensively in the Asahi tree. It is far better for me to insert a "reformat asahi" commit once in a while when I rebase the Asahi tree, than to shoot down an unrelated upstream MR because someone forgot to ninja clang-format. I regret adding the clang-format lint to CI. To those who have lost merges over it, I am sorry. I'm learning from my mistakes and trying to do better. I would encourage other drivers in the clang-format include to follow suit, but doing this effectively requires a driver/hardware tree to do the enforcement. (I would also encourage that, as it is much friendlier to upstream CI, but that's a different discussion.) For now, let's opt out asahi at the least. Signed-off-by: Alyssa Rosenzweig <aly...@rosenzweig.io> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26030> --- .clang-format-include | 1 - .gitlab-ci/test-source-dep.yml | 1 - 2 files changed, 2 deletions(-) diff --git a/.clang-format-include b/.clang-format-include index ca132cddc9b..3ca303188db 100644 --- a/.clang-format-include +++ b/.clang-format-include @@ -1,7 +1,6 @@ # The following files are opted into `ninja clang-format` and # enforcement in the CI. -src/**/asahi/**/* src/**/panfrost/**/* src/gallium/drivers/i915 src/amd/vulkan/**/* diff --git a/.gitlab-ci/test-source-dep.yml b/.gitlab-ci/test-source-dep.yml index 4320fd8c175..2c5e251f26f 100644 --- a/.gitlab-ci/test-source-dep.yml +++ b/.gitlab-ci/test-source-dep.yml @@ -235,7 +235,6 @@ - .clang-format-ignore - src/**/.clang-format - src/egl/**/* - - src/**/asahi/**/* - src/**/panfrost/**/* - src/amd/vulkan/**/* - src/amd/compiler/**/*
