Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix/pr comment ci #442

Merged
merged 3 commits into from
Aug 7, 2024
Merged

Fix/pr comment ci #442

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c13dc99
fix(pr-comment-ci): process completed with exit code 1
liweijie0812 Aug 7, 2024
11954b3
fix(pr-comment-ci): process completed with exit code 1
liweijie0812 Aug 7, 2024
35f3697
Merge branch 'develop' into fix/pr-comment-ci
liweijie0812 Aug 7, 2024
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
25 changes: 17 additions & 8 deletions .github/workflows/pr-comment-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,28 +106,37 @@ jobs:
ssr_snap_conflict=$(git status | grep 'both modified:' | grep -c 'ssr.test.jsx.snap')
common_conflict=$(git status | grep 'both modified:' | grep -c '_common')
conflicts_sum=$((csr_snap_conflict + ssr_snap_conflict + common_conflict))
echo "conflict_count: $conflict_count"
echo "working_tree_clean: $working_tree_clean"
echo "csr_snap_conflict: $csr_snap_conflict"
echo "ssr_snap_conflict: $ssr_snap_conflict"
echo "common_conflict: $common_conflict"
echo "conflicts_sum: $conflicts_sum"

if [ "$working_tree_clean" -eq "1" ]; then
echo "nothing to commit, working tree clean"
exit 0
echo "nothing to commit, working tree clean"
exit 0
fi

if [ "$conflict_count" -gt "0" ]&&[ "$conflicts_sum" -eq "0" ]; then
echo "Unknown conflict "
git status
exit 1
echo "Unknown conflict "
git status
exit 1
fi

if [ "$csr_snap_conflict" -eq "1" ];then
git checkout --theirs test/snap/__snapshots__/csr.test.jsx.snap
git checkout -f develop test/snap/__snapshots__/csr.test.jsx.snap
echo "resolve conflict csr.test.jsx.snap"
fi

if [ "$ssr_snap_conflict" -eq "1" ];then
git checkout --theirs test/snap/__snapshots__/ssr.test.jsx.snap
git checkout -f develop test/snap/__snapshots__/ssr.test.jsx.snap
echo "resolve conflict ssr.test.jsx.snap"
fi

if [ "$common_conflict" -eq "1" ];then
git checkout --theirs src/_common
git checkout -f develop src/_common
echo "resolve conflict _common"
fi

git commit -am "chore: merge develop"
Expand Down
Loading