aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <michael.blumenkrantz@gmail.com>2024-02-27 12:36:54 -0500
committerMarge Bot <emma+marge@anholt.net>2024-02-28 09:05:07 +0000
commit150525980e1d2211cf07a9d1e43367f97525f8f2 (patch)
tree3298a6e009f9e7573f540859c433858774fc6c12
parent803a1a5adac2b3fe637f16a8d4d2fc2ec1d6f751 (diff)
downloadmesa3d-150525980e1d2211cf07a9d1e43367f97525f8f2.tar.gz
ci: disable clang-format job
this is still killing merge pipelines Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27831>
-rw-r--r--.gitlab-ci/test-source-dep.yml23
-rw-r--r--.gitlab-ci/test/gitlab-ci.yml15
2 files changed, 0 insertions, 38 deletions
diff --git a/.gitlab-ci/test-source-dep.yml b/.gitlab-ci/test-source-dep.yml
index c715a0afe47..551b6cc648b 100644
--- a/.gitlab-ci/test-source-dep.yml
+++ b/.gitlab-ci/test-source-dep.yml
@@ -238,26 +238,3 @@
- changes: *rust_file_list
when: on_success
allow_failure: true
-
-.lint-clang-format-rules:
- rules:
- - !reference [.never-post-merge-rules, rules]
- - !reference [.core-rules, rules]
- # in merge pipeline, formatting checks are not allowed to fail
- - if: $GITLAB_USER_LOGIN == "marge-bot" && $CI_PIPELINE_SOURCE == "merge_request_event"
- changes: &clang_format_file_list
- - .clang-format
- - .clang-format-include
- - .clang-format-ignore
- - src/**/.clang-format
- - src/egl/**/*
- - src/amd/vulkan/**/*
- - src/amd/compiler/**/*
- - src/etnaviv/isa/**/*
- - src/gallium/targets/teflon/**/*
- when: on_success
- allow_failure: false
- # in other pipelines, formatting checks are allowed to fail
- - changes: *clang_format_file_list
- when: on_success
- allow_failure: true
diff --git a/.gitlab-ci/test/gitlab-ci.yml b/.gitlab-ci/test/gitlab-ci.yml
index 2aaed41f4a6..a275deeced3 100644
--- a/.gitlab-ci/test/gitlab-ci.yml
+++ b/.gitlab-ci/test/gitlab-ci.yml
@@ -43,21 +43,6 @@ rustfmt:
- rustfmt --verbose src/**/lib.rs
- rustfmt --verbose src/**/main.rs
-clang-format:
- extends:
- - .formatting-check
- - .lint-clang-format-rules
- variables:
- LLVM_VERSION: 15
- before_script:
- - shopt -s globstar
- # We need a meson build dir, but its config doesn't actually matter, so
- # let's just use the default.
- - meson setup build
- - clang-format-${LLVM_VERSION} --version
- - ninja -C build clang-format
- allow_failure: true
-
.test-check:
# Cancel job if a newer commit is pushed to the same branch
interruptible: true