Skip to content

Commit

Permalink
ci: update pr-comment-ci (#5004)
Browse files Browse the repository at this point in the history
  • Loading branch information
liweijie0812 authored Feb 11, 2025
1 parent b5df611 commit dc52047
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions .github/workflows/pr-comment-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ jobs:
git status
conflict_count=$(git status | grep -c 'both modified:') || true
working_tree_clean=$(git status | grep -c 'nothing to commit, working tree clean') || true
common_conflict=$(git status | grep 'both modified:' | grep -c '_common') || true
common_conflict=$(git status | grep 'both modified:' | grep -c 'packages/common') || true
conflicts_sum=$((common_conflict))
echo "conflict_count: $conflict_count"
echo "working_tree_clean: $working_tree_clean"
Expand All @@ -129,7 +129,7 @@ jobs:
if [ "$common_conflict" -eq "1" ];then
git checkout --ours packages/common
git add packages/common
echo "resolve conflict _common"
echo "resolve conflict packages/common"
fi
git status
Expand Down Expand Up @@ -186,7 +186,7 @@ jobs:
working_tree_clean=$(git status | grep -c 'nothing to commit, working tree clean') || true
csr_snap_conflict=$(git status | grep 'both modified:' | grep -c 'csr.test.jsx.snap') || true
ssr_snap_conflict=$(git status | grep 'both modified:' | grep -c 'ssr.test.jsx.snap') || true
common_conflict=$(git status | grep 'both modified:' | grep -c '_common') || true
common_conflict=$(git status | grep 'both modified:' | grep -c 'packages/common') || true
conflicts_sum=$((csr_snap_conflict + ssr_snap_conflict + common_conflict))
echo "conflict_count: $conflict_count"
echo "working_tree_clean: $working_tree_clean"
Expand Down Expand Up @@ -221,7 +221,7 @@ jobs:
if [ "$common_conflict" -eq "1" ];then
git checkout --theirs packages/common
git add packages/common
echo "resolve conflict _common"
echo "resolve conflict packages/common"
fi
git status
Expand All @@ -231,9 +231,9 @@ jobs:
with:
node-version: 18

- run: npm install
- run: pnpm install

- run: npm run test:update
- run: pnpm run test:update

- name: Commit Snapshot
run: |
Expand Down Expand Up @@ -289,9 +289,9 @@ jobs:
with:
node-version: 18

- run: npm install
- run: pnpm install

- run: npm run generate:coverage-badge
- run: pnpm run generate:coverage-badge

- name: commit coverage badge
run: |
Expand Down

0 comments on commit dc52047

Please sign in to comment.