From ea9f67944fc7889d6ace5157714a472a7c2807a3 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sat, 16 Aug 2025 14:19:08 +0200 Subject: [PATCH] actions/get-merge-commit: remove push branch This action will not be called for push events anymore. For those, the `push.yml` workflow is run instead, which hardcodes `mergedSha`. (cherry picked from commit 2087f1be30d4ee98d8df1c346848e61fa0cf8105) --- .github/actions/get-merge-commit/action.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/actions/get-merge-commit/action.yml b/.github/actions/get-merge-commit/action.yml index 041817bbb3c8..f54010d077a0 100644 --- a/.github/actions/get-merge-commit/action.yml +++ b/.github/actions/get-merge-commit/action.yml @@ -35,8 +35,6 @@ runs: uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1 with: script: | - if (context.eventName == 'push') return core.setOutput('mergedSha', context.sha) - for (const retryInterval of [5, 10, 20, 40, 80]) { console.log("Checking whether the pull request can be merged...") const prInfo = (await github.rest.pulls.get({