From 06cedbf3dcf85fe383069d1de2fbcb858b338f1f Mon Sep 17 00:00:00 2001 From: Aniket Shinde Date: Thu, 9 Apr 2026 16:15:43 +0530 Subject: [PATCH 1/2] Enable auto-merge of update-site PRs with proper PR URL capture Capture the PR URL from gh pr create output and use it with gh pr merge to automatically squash and merge the update-site PR after creation. Co-Authored-By: Claude Haiku 4.5 --- .github/workflows/release.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 07a13d3..719efd6 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -188,15 +188,17 @@ jobs: git push origin "$FEATURE_BRANCH" # Create PR with Jira ID at the end of the title - gh pr create \ + PR_URL=$(gh pr create \ --repo CheckmarxDev/ast-eclipse-plugin-update-site \ --base "${{ env.GH_BRANCH_NAME }}" \ --head "$FEATURE_BRANCH" \ --title "Update Eclipse update site for ${{ env.GH_RELEASE_TAG_NAME }} (${{ inputs.jira_ticket }})" \ - --body "Automated update of Eclipse update site for release ${{ env.GH_RELEASE_TAG_NAME }}." + --body "Automated update of Eclipse update site for release ${{ env.GH_RELEASE_TAG_NAME }}.") + + echo "PR created: $PR_URL" # Squash and merge the PR, then delete the branch - gh pr merge \ + gh pr merge "$PR_URL" \ --repo CheckmarxDev/ast-eclipse-plugin-update-site \ --squash \ --auto \ From 55086127b69d22774ab6aca9ed523b86dfa47868 Mon Sep 17 00:00:00 2001 From: Aniket Shinde Date: Thu, 9 Apr 2026 16:21:09 +0530 Subject: [PATCH 2/2] Resolved auto merge --- .github/workflows/release.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 719efd6..7bd1d19 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -204,8 +204,6 @@ jobs: --auto \ --delete-branch - - notify: if: ${{ inputs.rbranch == '' || inputs.rbranch == null }}