Unverified Commit 57468986 authored by Silvan Mosberger's avatar Silvan Mosberger Committed by GitHub
Browse files

Merge pull request #261693 from Artturin/bynameprint

workflows/check-by-name: print failed command output
parents 614182f9 5fbbada2
Loading
Loading
Loading
Loading
+3 −1
Original line number Diff line number Diff line
@@ -19,11 +19,13 @@ jobs:
    steps:
      - name: Resolving the merge commit
        run: |
          if result=$(git ls-remote --exit-code ${{ github.event.pull_request.base.repo.clone_url }} refs/pull/${{ github.event.pull_request.number }}/merge); then
          if result=$(git ls-remote --exit-code ${{ github.event.pull_request.base.repo.clone_url }} refs/pull/${{ github.event.pull_request.number }}/merge 2>&1); then
            mergedSha=$(cut -f1 <<< "$result")
            echo "The PR appears to not have any conflicts, checking the merge commit $mergedSha"
          else
            echo "The PR may have a merge conflict"
            echo "'git ls-remote' output was:"
            echo "$result"
            exit 1
          fi
          echo "mergedSha=$mergedSha" >> "$GITHUB_ENV"