Skip to content

Commit 03a2704

Browse files
committed
Merge branch 'main' into feat-tool-email
2 parents 98e0c42 + be95a3c commit 03a2704

File tree

224 files changed

+15988
-3248
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

224 files changed

+15988
-3248
lines changed

.github/workflows/prc.yml

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,16 +89,18 @@ jobs:
8989
runs-on: ubuntu-latest
9090
needs: test-go-modules
9191
steps:
92-
- uses: actions/download-artifact@v4
92+
- uses: actions/checkout@v3
93+
- name: Download coverage artifacts
94+
uses: actions/download-artifact@v4
9395
with:
9496
pattern: coverage-*
9597
merge-multiple: true
98+
path: coverage-artifacts
9699
- name: Combine coverage reports
97100
shell: bash
98101
run: |
99102
set -euo pipefail
100-
shopt -s nullglob
101-
files=(coverage-*.out)
103+
mapfile -t files < <(find coverage-artifacts -maxdepth 1 -type f -name 'coverage-*.out' | sort)
102104
if [ "${#files[@]}" -eq 0 ]; then
103105
echo "no coverage files found" >&2
104106
exit 1
@@ -107,6 +109,11 @@ jobs:
107109
for file in "${files[@]:1}"; do
108110
tail -n +2 "${file}" >> coverage.out
109111
done
112+
- name: Upload merged coverage artifact
113+
uses: actions/upload-artifact@v4
114+
with:
115+
name: coverage-merged
116+
path: coverage.out
110117
- name: Upload coverage reports to Codecov
111118
uses: codecov/codecov-action@v5
112119
with:

README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -246,6 +246,8 @@ func calculator(ctx context.Context, req calculatorReq) (calculatorRsp, error) {
246246
result = req.A * req.B
247247
case "div", "/":
248248
result = req.A / req.B
249+
default:
250+
return calculatorRsp{}, fmt.Errorf("invalid operation: %s", req.Op)
249251
}
250252
return calculatorRsp{Result: result}, nil
251253
}

README.zh_CN.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,9 @@ func calculator(ctx context.Context, req calculatorReq) (calculatorRsp, error) {
246246
result = req.A * req.B
247247
case "div", "/":
248248
result = req.A / req.B
249-
}
249+
default:
250+
return calculatorRsp{}, fmt.Errorf("invalid operation: %s", req.Op)
251+
}
250252
return calculatorRsp{Result: result}, nil
251253
}
252254

0 commit comments

Comments
 (0)