dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #261693 from Artturin/bynameprint

Browse Source 
workflows/check-by-name: print failed command output
This commit is contained in:
Silvan Mosberger 2023-10-17 21:20:26 +02:00 committed by GitHub
commit 574689866e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/check-by-name.yml vendored
View File

@ -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"