Skip to content

Commit

Permalink
fix: Add pull to workflow (#78)
Browse files Browse the repository at this point in the history
Signed-off-by: Whiteflight <[email protected]>
  • Loading branch information
Whiteflight authored Oct 2, 2024
1 parent 55556dd commit 9b719ff
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions .github/workflows/fast_forward.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,9 @@ jobs:
git config --global user.name "GitHub Actions"
git fetch
git checkout $HEAD_BRANCH
git pull
git checkout $BASE_BRANCH
git pull
git merge $HEAD_BRANCH --ff-only
git push
echo "::set-output name=message::'Fast forward successful.'"
Expand All @@ -60,7 +62,7 @@ jobs:
with:
route: POST /repos/{repository}/issues/{issue_number}/comments
repository: ${{ github.repository }}
issue_number: ${{ github.event.pull_request.number }}
issue_number: ${{ github.event.issue.number }}
body: ${{ steps.merge-status.outputs.message }}
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand All @@ -72,7 +74,7 @@ jobs:
with:
route: POST /repos/{repository}/issues/{issue_number}/comments
repository: ${{ github.repository }}
issue_number: ${{ github.event.pull_request.number }}
issue_number: ${{ github.event.issue.number }}
body: Unable to fast forward. Check the Actions execution tab for details.
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

0 comments on commit 9b719ff

Please sign in to comment.