From 7fbfab275e50290c3b19b35b0c180e64df15df52 Mon Sep 17 00:00:00 2001 From: Brian Ginsburg <7957636+bgins@users.noreply.github.com> Date: Fri, 30 Aug 2024 09:07:22 -0700 Subject: [PATCH] build: Remove release PR auto merge (#32) --- .github/workflows/release.yml | 37 ----------------------------------- 1 file changed, 37 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 25fa122b..75167e9d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -41,43 +41,6 @@ jobs: sha: ${{ steps.release.outputs.sha }} tag_name: ${{ steps.release.outputs.tag_name }} - merge: - if: needs.release.outputs.prs_created == 'true' && needs.release.outputs.releases_created == 'false' - name: Merge Release PR - needs: release - runs-on: ubuntu-latest - permissions: - pull-requests: write - contents: write - steps: - - name: Checkout - uses: actions/checkout@v4 - with: - ref: release-please--branches--main - - - name: Get Release Bot Token - id: get-release-bot-token - uses: peter-murray/workflow-application-token-action@v1 - with: - application_id: ${{ secrets.RELEASE_BOT_ID }} - application_private_key: ${{ secrets.RELEASE_BOT_PRIVATE_KEY }} - organization: "Lilypad-Tech" - - # Approve with github-actions bot - - name: Approve PR - id: approve - env: - GH_TOKEN: ${{ github.token }} - run: | - gh pr review --approve - - # Auto-merge PR when status checks complete or merge immediately if no checks in progress - # The auto-merge flag requires branch protection rule overrides. - - name: Merge Release PR - env: - GH_TOKEN: ${{ steps.get-release-bot-token.outputs.token }} - run: gh pr merge --squash --auto || gh pr merge --squash - extend-notes: if: needs.release.outputs.releases_created == 'true' && needs.release.outputs.prs_created == 'false' name: Extend Release Notes