From 599a651e9e0cea0d5bfa2a6b6065241d7811eab3 Mon Sep 17 00:00:00 2001 From: Bart <11445373+bthomee@users.noreply.github.com> Date: Thu, 9 Jul 2026 09:46:47 -0700 Subject: [PATCH] Use the correct workflow --- .github/workflows/check-pr-commits.yml | 1 - .github/workflows/conflicting-pr.yml | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/check-pr-commits.yml b/.github/workflows/check-pr-commits.yml index 81e8102d12..37e15a5648 100644 --- a/.github/workflows/check-pr-commits.yml +++ b/.github/workflows/check-pr-commits.yml @@ -10,5 +10,4 @@ permissions: jobs: check_commits: - if: ${{ !contains(github.event.pull_request.labels.*.name, 'IgnoreConflicts') }} uses: XRPLF/actions/.github/workflows/check-pr-commits.yml@e2c7f400d1e85ae65dad552fd425169fbacca4a3 diff --git a/.github/workflows/conflicting-pr.yml b/.github/workflows/conflicting-pr.yml index 772d46fd7d..cf65640954 100644 --- a/.github/workflows/conflicting-pr.yml +++ b/.github/workflows/conflicting-pr.yml @@ -14,6 +14,7 @@ permissions: jobs: main: + if: ${{ !contains(github.event.pull_request.labels.*.name, 'IgnoreConflicts') }} runs-on: ubuntu-latest steps: - name: Check if PRs are dirty