From 0c76f5e2ea3d47df9bf1bc59c5a822ce635e1f3a Mon Sep 17 00:00:00 2001 From: Joe Farrelly Date: Thu, 18 Jun 2026 19:09:54 +0100 Subject: [PATCH] =?UTF-8?q?Fix=20dev=E2=86=92main=20PR=20workflow=20head?= =?UTF-8?q?=20filter=20and=20null=20body=20guard?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/dev-to-main-pr.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/dev-to-main-pr.yml b/.github/workflows/dev-to-main-pr.yml index b18fdee..a4931c7 100644 --- a/.github/workflows/dev-to-main-pr.yml +++ b/.github/workflows/dev-to-main-pr.yml @@ -18,11 +18,10 @@ jobs: MERGED_BRANCH: ${{ github.event.pull_request.head.ref }} REPO: ${{ github.repository }} run: | - OWNER="${REPO%%/*}" EXISTING=$(gh pr list \ --repo "$REPO" \ --base main \ - --head "${OWNER}:dev" \ + --head dev \ --json number,body) PR_NUMBER=$(echo "$EXISTING" | jq -r '.[0].number // empty') @@ -35,9 +34,9 @@ jobs: --title "dev into main" \ --body "- $MERGED_BRANCH" else - BODY=$(echo "$EXISTING" | jq -r '.[0].body') + BODY=$(echo "$EXISTING" | jq -r '.[0].body // ""') - if echo "$BODY" | grep -qF "- $MERGED_BRANCH"; then + if echo "$BODY" | grep -qFe "- $MERGED_BRANCH"; then echo "Branch already listed, skipping." else gh pr edit "$PR_NUMBER" \