From 7c9f605a99823f0a2bffe3d8a6bdf7956e4e4fb3 Mon Sep 17 00:00:00 2001
From: "Richard Kuo (Danswer)" <rkuo@danswer.ai>
Date: Wed, 9 Oct 2024 11:44:47 -0700
Subject: [PATCH] fix pr merge command

---
 .github/workflows/hotfix-release-branches.yml |   4 +-
 .../workflows/hotfix-to-release-branches.yml  | 100 ------------------
 2 files changed, 2 insertions(+), 102 deletions(-)
 delete mode 100644 .github/workflows/hotfix-to-release-branches.yml

diff --git a/.github/workflows/hotfix-release-branches.yml b/.github/workflows/hotfix-release-branches.yml
index d660acc03..b94c4490a 100644
--- a/.github/workflows/hotfix-release-branches.yml
+++ b/.github/workflows/hotfix-release-branches.yml
@@ -147,17 +147,17 @@ jobs:
 
             # Extract the URL from the output
             PR_URL=$(echo "$PR_OUTPUT" | grep -Eo 'https://github.com/[^ ]+')
-
             echo "Pull request created: $PR_URL"
 
             # Extract PR number from URL
             PR_NUMBER=$(basename "$PR_URL")
+            echo "Pull request created: $PR_NUMBER"
 
             if [ "$AUTO_MERGE" == "true" ]; then
               echo "Attempting to merge pull request #$PR_NUMBER"
 
               # Attempt to merge the PR
-              gh pr merge "$PR_NUMBER" --merge --yes
+              gh pr merge "$PR_NUMBER" --merge --delete-branch
 
               if [ $? -eq 0 ]; then
                 echo "Pull request #$PR_NUMBER merged successfully."
diff --git a/.github/workflows/hotfix-to-release-branches.yml b/.github/workflows/hotfix-to-release-branches.yml
deleted file mode 100644
index dc8b50794..000000000
--- a/.github/workflows/hotfix-to-release-branches.yml
+++ /dev/null
@@ -1,100 +0,0 @@
-# This workflow is intended to be manually triggered via the GitHub Action tab.
-# Given a hotfix branch, it will attempt to open a PR to all release branches and
-# by default auto merge them
-
-name: Open PRs from hotfix to release branches
-
-on:
-  workflow_dispatch:
-    inputs:
-      hotfix_branch:
-        description: 'Hotfix branch name'
-        required: true
-      release_branch_pattern:
-        description: 'Release branch pattern (regex)'
-        required: true
-        default: 'release/.*'
-      auto_merge:
-        description: 'Automatically merge the PRs if set to true'
-        required: false
-        default: 'true'
-        
-jobs:
-  hotfix_to_release:
-    # See https://runs-on.com/runners/linux/
-    # use a lower powered instance since this just does i/o to docker hub
-    runs-on: [runs-on,runner=2cpu-linux-x64,"run-id=${{ github.run_id }}"]
-    steps:
-      - name: Checkout Repository
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Fetch All Branches
-        run: |
-          git fetch --all --prune
-
-      - name: Get Release Branches
-        id: get_release_branches
-        run: |
-          BRANCHES=$(git branch -r | grep -E "${{ github.event.inputs.release_branch_pattern }}" | sed 's|origin/||' | tr -d ' ')
-          if [ -z "$BRANCHES" ]; then
-            echo "No release branches found matching pattern '${{ github.event.inputs.release_branch_pattern }}'."
-            exit 1
-          fi
-          echo "Found release branches:"
-          echo "$BRANCHES"
-          # Set the branches as an output
-          echo "branches=$BRANCHES" >> $GITHUB_OUTPUT
-
-      - name: Ensure Hotfix Branch Exists Locally
-        run: |
-          git fetch origin "${{ github.event.inputs.hotfix_branch }}":"${{ github.event.inputs.hotfix_branch }}" || true
-
-      - name: Create and Merge Pull Requests to Matching Release Branches
-        env:
-          HOTFIX_BRANCH: ${{ github.event.inputs.hotfix_branch }}
-          AUTO_MERGE: ${{ github.event.inputs.auto_merge }}
-        run: |
-          # Get the branches from the previous step
-          BRANCHES="${{ steps.get_release_branches.outputs.branches }}"
-
-          # Convert BRANCHES to an array
-          IFS=$'\n' read -rd '' -a BRANCH_ARRAY <<<"$BRANCHES"
-
-          # Loop through each release branch and create and merge a PR
-          for RELEASE_BRANCH in $BRANCHES; do
-            echo "Creating PR from $HOTFIX_BRANCH to $RELEASE_BRANCH"
-
-            # Check if PR already exists
-            EXISTING_PR=$(gh pr list --head "$HOTFIX_BRANCH" --base "$RELEASE_BRANCH" --state open --json number --jq '.[0].number')
-
-            if [ -n "$EXISTING_PR" ]; then
-              echo "An open PR already exists: #$EXISTING_PR. Skipping..."
-              continue
-            fi
-            
-            # Create a new PR
-            PR_URL=$(gh pr create --title "Merge $HOTFIX_BRANCH into $RELEASE_BRANCH" \
-              --body "Automated PR to merge \`$HOTFIX_BRANCH\` into \`$RELEASE_BRANCH\`." \
-              --head "$HOTFIX_BRANCH" --base "$RELEASE_BRANCH" --json url --jq '.url')
-
-            echo "Pull request created: $PR_URL"
-
-            # Extract PR number from URL
-            PR_NUMBER=$(basename "$PR_URL")
-
-            if [ "$AUTO_MERGE" == "true" ]; then
-              echo "Attempting to merge pull request #$PR_NUMBER"
-
-              # Attempt to merge the PR
-              gh pr merge "$PR_NUMBER" --merge --admin --yes
-
-              if [ $? -eq 0 ]; then
-                echo "Pull request #$PR_NUMBER merged successfully."
-              else
-                echo "Failed to merge pull request #$PR_NUMBER."
-                # Optionally, handle the error or continue
-              fi
-            fi
-          done
\ No newline at end of file