From 44f04a91f36cbd9efa8e061c70767d3ebd308748 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Thu, 3 Oct 2024 11:29:30 +0200 Subject: [PATCH] [ticket/17407] Combine create and update step and use replace edit-mode [skip ci] Since this change won't run until merged. PHPBB-17407 --- .github/workflows/check_merge_to_master.yml | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/.github/workflows/check_merge_to_master.yml b/.github/workflows/check_merge_to_master.yml index 96e0172b8f..45288a072a 100644 --- a/.github/workflows/check_merge_to_master.yml +++ b/.github/workflows/check_merge_to_master.yml @@ -51,24 +51,13 @@ jobs: body-includes: The attempt to merge branch `3.3.x` into `master` has completed - name: Post comment on PR - if: steps.fc.outputs.comment-id == '' + if: always() # Ensure this step always runs, regardless of merge result uses: peter-evans/create-or-update-comment@v4 with: token: ${{ secrets.GITHUB_TOKEN }} issue-number: ${{ github.event.pull_request.number }} - body: | - The attempt to merge branch `3.3.x` into `master` has completed after considering the changes in this PR. - - - Merge result: ${{ steps.merge_master.outputs.mergeable == 'true' && 'Success ✅' || 'Conflict ❌' }} - - ${{ steps.merge_master.outputs.mergeable == 'true' && 'This PR is ready to be merged.' || 'A separate PR will be needed to merge `3.3.x` into `master`.' }} - - - name: Update comment on PR - if: steps.fc.outputs.comment-id != '' - uses: peter-evans/create-or-update-comment@v4 - with: - token: ${{ secrets.GITHUB_TOKEN }} comment-id: ${{ steps.fc.outputs.comment-id }} + edit-mode: replace body: | The attempt to merge branch `3.3.x` into `master` has completed after considering the changes in this PR.