fix: fetch PR head before merging it in "check ff"

This commit is contained in:
UdjinM6 2024-10-24 15:20:15 +03:00
parent 3a18f087bf
commit c3aae9e165
No known key found for this signature in database
GPG Key ID: 83592BD1400D58D9

View File

@ -28,6 +28,7 @@ jobs:
git fetch origin master:master git fetch origin master:master
git checkout master git checkout master
if [[ "${{ github.event_name }}" == "pull_request"* ]]; then if [[ "${{ github.event_name }}" == "pull_request"* ]]; then
git fetch origin pull/${{ github.event.pull_request.number }}/head
git merge --ff-only ${{ github.event.pull_request.head.sha }} git merge --ff-only ${{ github.event.pull_request.head.sha }}
else else
git merge --ff-only ${{ github.sha }} git merge --ff-only ${{ github.sha }}