From 77184226e571fec68257119b810c1ca82a762632 Mon Sep 17 00:00:00 2001 From: Keith Williams Date: Mon, 12 Jan 2026 14:24:43 -0300 Subject: [PATCH] ci: use pull_request_target for conflict resolver label trigger (#26762) * fix: use pull_request_target for conflict resolver label trigger Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> * fix: update if condition to check for pull_request_target event name Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> --------- Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> --- .github/workflows/devin-conflict-resolver.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/devin-conflict-resolver.yml b/.github/workflows/devin-conflict-resolver.yml index 8bff640f1d..a137341a33 100644 --- a/.github/workflows/devin-conflict-resolver.yml +++ b/.github/workflows/devin-conflict-resolver.yml @@ -1,7 +1,7 @@ name: Devin PR Conflict Resolver on: - pull_request: + pull_request_target: types: [labeled] workflow_dispatch: inputs: @@ -20,7 +20,7 @@ jobs: runs-on: blacksmith-2vcpu-ubuntu-2404 # Only run when devin-conflict-resolution label is added, or on manual dispatch if: | - (github.event_name == 'pull_request' && github.event.label.name == 'devin-conflict-resolution') || + (github.event_name == 'pull_request_target' && github.event.label.name == 'devin-conflict-resolution') || github.event_name == 'workflow_dispatch' steps: - name: Get PR details