Skip to content

Commit

Permalink
更新 pr-comment-ci.yml
Browse files Browse the repository at this point in the history
  • Loading branch information
liweijie0812 authored Aug 7, 2024
1 parent e4100f6 commit 1171c98
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions .github/workflows/pr-comment-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ jobs:
if [ "$working_tree_clean" -eq "1" ]; then
echo "nothing to commit, working tree clean"
exit 0
return 0
fi
if [ "$count_both_modified" -gt "0" ]&&[ "$both_modified_csr_snap" -eq "0" ]&&[ "$both_modified_ssr_snap" -eq "0" ]; then
Expand All @@ -124,7 +124,7 @@ jobs:
git checkout --theirs test/snap/__snapshots__/ssr.test.jsx.snap
fi
git commit -am "chore: merge develop fix snap conflict"
exit 0
return 0
fi
git commit -am "chore: merge develop"
Expand All @@ -139,8 +139,6 @@ jobs:
working_tree_clean=$(git status | grep -c 'nothing to commit, working tree clean')
if [ "$working_tree_clean" -eq "0" ]; then
git add .
git config --local user.email "github-actions[bot]@users.noreply.github.com"
git config --local user.name "github-actions[bot]"
git commit -m "chore: update snapshot"
fi
- name: git push
Expand Down

0 comments on commit 1171c98

Please sign in to comment.