From f7a3815bff4c4c8fc63878cb5ed30aba805acfd2 Mon Sep 17 00:00:00 2001 From: wangxiyuan Date: Thu, 25 Sep 2025 18:45:19 +0800 Subject: [PATCH] [CI] Do not drop ready label when PR is merge conflict (#3173) ### What this PR does / why we need it? `ready` label now is used for trigger full e2e test now. If a PR is ready and merge conflict then, no need to drop the ready label. ### Does this PR introduce _any_ user-facing change? No ### How was this patch tested? Just a github action change. No need for function test. - vLLM version: v0.10.2 - vLLM main: https://github.com/vllm-project/vllm/commit/52d0cb845866869d587fc013a7c59e60a86ebcf2 Signed-off-by: wangxiyuan --- .github/workflows/label_merge_conflict.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/label_merge_conflict.yml b/.github/workflows/label_merge_conflict.yml index b93e6d7..3118d2e 100644 --- a/.github/workflows/label_merge_conflict.yml +++ b/.github/workflows/label_merge_conflict.yml @@ -16,6 +16,5 @@ jobs: uses: eps1lon/actions-label-merge-conflict@v3 with: dirtyLabel: "merge-conflicts" - removeOnDirtyLabel: "ready" repoToken: "${{ secrets.GITHUB_TOKEN }}" commentOnDirty: "This pull request has conflicts, please resolve those before we can evaluate the pull request."