Skip to content

Commit

Permalink
fix: Spelling and order of branches
Browse files Browse the repository at this point in the history
Signed-off-by: Whiteflight <[email protected]>
  • Loading branch information
Whiteflight committed Oct 2, 2024
1 parent a46930c commit eed18ff
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/fast_forward.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,16 +42,16 @@ jobs:
id: merge-status
shell: bash
env:
BASE_BRANCH: ${{ fromJson(steps.get-pr-details.outputs.data).base.ref }}
HEAD_BRANCH: ${{ fromJson(steps.get-pr-details.outputs.data).head.ref }}
BASE_BRANCH: ${{ fromJson(steps.get-pr-details.outputs.data).base.ref }}
run: |
git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
git config --global user.name "GitHub Actions"
git checkout $HEAD_BRANCH
git checkout $BASE_BRANCH
git merge $HEAD_BRANCH --ff-only
git push
echo "::set-output name=message::'Fast forward succesfull.'"
echo "::set-output name=message::'Fast forward successful.'"
# Post a success/failure comment to the PR.
- name: Add comment to PR
Expand All @@ -72,6 +72,6 @@ jobs:
route: POST /repos/{repository}/issues/{issue_number}/comments
repository: ${{ github.repository }}
issue_number: ${{ github.event.issue.number }}
body: PR cannot be fast forward. Check the Actions execution tab for details.
body: Unable to fast forward. Check the Actions execution tab for details.
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

0 comments on commit eed18ff

Please sign in to comment.