From 90c4107199b30cc229175425d1a40ac0dbe70965 Mon Sep 17 00:00:00 2001 From: Octol1ttle Date: Mon, 16 Mar 2026 23:11:52 +0500 Subject: [PATCH] Actually update blocked/blocking workflow Signed-off-by: Octol1ttle --- .github/workflows/blocked-prs.yml | 4 ++-- .github/workflows/merge-blocking-pr.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/blocked-prs.yml b/.github/workflows/blocked-prs.yml index 784bf4f6e..80c91a96a 100644 --- a/.github/workflows/blocked-prs.yml +++ b/.github/workflows/blocked-prs.yml @@ -152,7 +152,7 @@ jobs: - name: Add 'blocked' Label if Missing id: label_blocked - if: (fromJSON(steps.pr_ids.outputs.prs).numBlocking > 0) && !contains(fromJSON(env.JOB_DATA).prLabels, 'blocked') && !fromJSON(steps.blocking_data.outputs.all_merged) + if: "(fromJSON(steps.pr_ids.outputs.prs).numBlocking > 0) && !contains(fromJSON(env.JOB_DATA).prLabels, 'status: blocked') && !fromJSON(steps.blocking_data.outputs.all_merged)" continue-on-error: true env: GH_TOKEN: ${{ steps.generate-token.outputs.token }} @@ -166,7 +166,7 @@ jobs: env: GH_TOKEN: ${{ steps.generate-token.outputs.token }} run: | - gh -R ${{ github.repository }} issue edit --remove-label 'blocked' "$PR_NUMBER" + gh -R ${{ github.repository }} issue edit --remove-label 'status: blocked' "$PR_NUMBER" - name: Apply 'blocking' Label to Unmerged Dependencies id: label_blocking diff --git a/.github/workflows/merge-blocking-pr.yml b/.github/workflows/merge-blocking-pr.yml index 5c6357430..86daf537d 100644 --- a/.github/workflows/merge-blocking-pr.yml +++ b/.github/workflows/merge-blocking-pr.yml @@ -20,7 +20,7 @@ jobs: # a pr that was a `blocking:` label was merged. # find the open pr's it was blocked by and trigger a refresh of their state - if: ${{ github.event_name == 'workflow_dispatch' || github.event.pull_request.merged == true && contains(github.event.pull_request.labels.*.name, 'blocking') }} + if: "${{ github.event_name == 'workflow_dispatch' || github.event.pull_request.merged == true && contains(github.event.pull_request.labels.*.name, 'status: blocking') }}" steps: - name: Generate token @@ -37,7 +37,7 @@ jobs: PR_NUMBER: ${{ inputs.pr_id || github.event.pull_request.number }} run: | blocked_prs=$( - gh -R ${{ github.repository }} pr list --label 'blocked' --json 'number,body' \ + gh -R ${{ github.repository }} pr list --label 'status: blocked' --json 'number,body' \ | jq -c --argjson pr "$PR_NUMBER" ' reduce ( .[] | select( .body |