BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #259074 from tweag/detect-merge-conflicts

Browse source 
workflows/check-by-name: Better error for merge conflicts
This commit is contained in:
Silvan Mosberger 2023-10-06 05:09:54 +02:00 committed by GitHub
commit b3e14b9045
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
.github/workflows/check-by-name.yml vendored
View file

@ -17,16 +17,24 @@ jobs:
# as specified in nixos/release-combined.nix # as specified in nixos/release-combined.nix
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: 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
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"
exit 1
fi
echo "mergedSha=$mergedSha" >> "$GITHUB_ENV"
- uses: actions/checkout@v4 - uses: actions/checkout@v4
with: with:
# pull_request_target checks out the base branch by default # pull_request_target checks out the base branch by default
ref: refs/pull/${{ github.event.pull_request.number }}/merge ref: ${{ env.mergedSha }}
# Fetches the merge commit and its parents # Fetches the merge commit and its parents
fetch-depth: 2 fetch-depth: 2
- name: Determining PR git hashes - name: Determining PR git hashes
run: | run: |
echo "mergedSha=$(git rev-parse HEAD)" >> "$GITHUB_ENV"
# For pull_request_target this is the same as $GITHUB_SHA # For pull_request_target this is the same as $GITHUB_SHA
echo "baseSha=$(git rev-parse HEAD^1)" >> "$GITHUB_ENV" echo "baseSha=$(git rev-parse HEAD^1)" >> "$GITHUB_ENV"