Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/commands.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ jobs:
run: |
echo "outcome=${{ steps.run-cmd.outcome }}" > result
if [[ "${{ steps.run-cmd.outcome }}" == "success" ]]; then
git diff > repo.patch || true
git diff -U5 > repo.patch || true
if [ -s repo.patch ]; then echo "hasPatch=true" >> result; else echo "hasPatch=false" >> result; fi
else
echo "hasPatch=false" >> result
Expand Down Expand Up @@ -111,7 +111,7 @@ jobs:
- name: Apply and push patch
if: ${{ steps.read-meta.outputs.step_outcome == 'success' && steps.read-meta.outputs.hasPatch == 'true' }}
run: |
git apply repo.patch
git apply --3way repo.patch
git config user.name "GH Actions"
git config user.email "[email protected]"
git add -A
Expand Down