diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml index 3360a12d33..d0fd8cf649 100644 --- a/.github/workflows/merge.yml +++ b/.github/workflows/merge.yml @@ -46,9 +46,8 @@ jobs: id: appcat run: | PR_NUMBER=${{ github.event.issue.number }} - PR_DATA=$(gh pr view "$PR_NUMBER" --repo "${{ github.repository }}" --json title,labels,baseRefName,headRefName,headRefOid,mergeable,reviews,author) + PR_DATA=$(gh pr view "$PR_NUMBER" --repo "${{ github.repository }}" --json labels,baseRefName,headRefName,headRefOid,mergeable,reviews,author) - TITLE=$(echo "$PR_DATA" | jq -r '.title') LABELS=$(echo "$PR_DATA" | jq -r '[.labels[].name]') BASE=$(echo "$PR_DATA" | jq -r '.baseRefName') BRANCH=$(echo "$PR_DATA" | jq -r '.headRefName') @@ -57,8 +56,8 @@ jobs: APPROVED=$(echo "$PR_DATA" | jq -r '.reviews // [] | map(select(.state == "APPROVED")) | length') AUTHOR=$(echo "$PR_DATA" | jq -r '.author.login') - # Check for hotfix in title or labels - if echo "$TITLE" | grep -i 'hotfix' > /dev/null || echo "$LABELS" | grep -i 'hotfix' > /dev/null; then + # Check for hotfix in labels + if echo "$LABELS" | grep -i 'hotfix' > /dev/null; then echo "is-hotfix=true" >> "$GITHUB_OUTPUT" else echo "is-hotfix=false" >> "$GITHUB_OUTPUT"