From 3a0c61a4559a1ce3e82b61ccf1a64df3b6a9820f Mon Sep 17 00:00:00 2001 From: yellow-shine Date: Tue, 27 Aug 2024 15:40:59 +0800 Subject: [PATCH] fix: [skip e2e]change conflict key (#35733) Signed-off-by: Yellow Shine --- .github/mergify.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/mergify.yml b/.github/mergify.yml index 6865b740e7..29802073eb 100644 --- a/.github/mergify.yml +++ b/.github/mergify.yml @@ -1,4 +1,4 @@ -shared: +misc: - &source_code_files files~=^(?=.*((\.(go|h|cpp)|go.sum|go.mod|CMakeLists.txt|conanfile\.*))).*$ - &no_source_code_files -files~=^(?=.*((\.(go|h|cpp)|go.sum|go.mod|CMakeLists.txt|conanfile\.*))).*$ - when_build_and_test_status_successs: &Build_AND_TEST_STATUS_SUCESS_ON_UBUNTU_20_OR_UBUNTU_22