Skip to content

Commit 7b321d8

Browse files
authored
debug (#304)
* debug * fix
1 parent c6694d0 commit 7b321d8

File tree

1 file changed

+8
-10
lines changed

1 file changed

+8
-10
lines changed

.github/workflows/utils.yaml

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -147,8 +147,8 @@ jobs:
147147
echo "bvt_coverage='bvt_coverage.out'" >> $GITHUB_ENV
148148
echo "ut_html_coverage='ut_coverage.html'" >> $GITHUB_ENV
149149
echo "bvt_html_coverage='bvt_coverage.html'" >> $GITHUB_ENV
150-
echo "ut_excluded_pkg='pkg/pb\|pkg/sql/parsers/goyacc\|yaccpar'" >> $GITHUB_ENV
151-
echo "bvt_excluded_pkg='pkg/pb\|yaccpar'" >> $GITHUB_ENV
150+
echo "ut_excluded_pkg='pkg/pb|pkg/sql/parsers/goyacc|yaccpar'" >> $GITHUB_ENV
151+
echo "bvt_excluded_pkg='pkg/pb|yaccpar'" >> $GITHUB_ENV
152152
echo 'GOPROXY=http://goproxy.goproxy.svc.cluster.local|https://goproxy.cn|direct' >> $GITHUB_ENV
153153
154154
# - uses: matrixorigin/setup-hdfs@master
@@ -289,10 +289,9 @@ jobs:
289289
set -uo pipefail
290290
set -ex
291291
cd $GITHUB_WORKSPACE/matrixone
292-
cat ${{ env.raw_ut_coverage }} | grep -Ev ${{ env.ut_excluded_pkg }} > ${{ env.ut_coverage }}
292+
grep -Ev ${{ env.ut_excluded_pkg }} ${{ env.raw_ut_coverage }} > ${{ env.ut_coverage }}
293293
echo "ut_coverage finished"
294-
# no need it now
295-
# go tool cover -o ${{ env.ut_html_coverage }} -html=${{ env.ut_coverage }}
294+
go tool cover -o ${{ env.ut_html_coverage }} -html=${{ env.ut_coverage }}
296295
echo "ut_html_coverage finished"
297296
rm -rf ${{ env.raw_ut_coverage }}
298297
pids=$(ps -aux | grep 'mo-service' | grep -v 'grep' | awk '{print $2}')
@@ -303,14 +302,13 @@ jobs:
303302
i=1 && while [ -n "$(ps -aux|grep 'mo-service' | grep -v 'grep' | awk '{print $2}')" ] && [ $i -le 300 ]; do echo "mo-service kill not finished......$i/300"; i=$(($i+1)); sleep 1s; done
304303
if [ $i -gt 300 ]; then echo 'stop mo-service failed...'; exit 1; else echo 'stop mo-service successed...'; fi
305304
go tool covdata textfmt -i="$GITHUB_WORKSPACE/matrixone" -o ${{ env.raw_bvt_coverage }}
306-
cat ${{ env.raw_bvt_coverage }} | grep -Ev ${{ env.bvt_excluded_pkg }} > ${{ env.bvt_coverage }}
305+
grep -Ev ${{ env.bvt_excluded_pkg }} ${{ env.raw_bvt_coverage }} > ${{ env.bvt_coverage }}
307306
echo "bvt_coverage finished"
308-
# no need it now
309-
# go tool cover -o ${{ env.bvt_html_coverage }} -html=${{ env.bvt_coverage }}
307+
go tool cover -o ${{ env.bvt_html_coverage }} -html=${{ env.bvt_coverage }}
310308
echo "bvt_html_coverage finished"
311309

312-
# generate sorted ut coverage file
313-
sort ut_coverage.out | uniq > ut_coverage_sort.out
310+
# # generate sorted ut coverage file
311+
# sort ut_coverage.out | uniq > ut_coverage_sort.out
314312

315313
- name: Upload Compressed Files
316314
uses: actions/upload-artifact@v5

0 commit comments

Comments
 (0)