From c90e321f9ce51c1e9d2360629025c5426199fb37 Mon Sep 17 00:00:00 2001
From: winlin <winlin@vip.126.com>
Date: Tue, 10 Dec 2019 21:34:20 +0800
Subject: [PATCH] Fix the path for circleci

---
 .circleci/codecov.yml  | 2 ++
 .circleci/config.yml   | 3 ---
 trunk/auto/coverage.sh | 7 ++++---
 3 files changed, 6 insertions(+), 6 deletions(-)
 create mode 100644 .circleci/codecov.yml

diff --git a/.circleci/codecov.yml b/.circleci/codecov.yml
new file mode 100644
index 000000000..301e3ca46
--- /dev/null
+++ b/.circleci/codecov.yml
@@ -0,0 +1,2 @@
+fixes:
+  - "src/::trunk/src"
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 21c150eec..9fa2e06e3 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -9,8 +9,6 @@ jobs:
   test:
     docker:
       - image: ossrs/srs:dev
-    fixes:
-      - "src/::trunk/src"
     steps:
       - checkout
       - run: cd trunk && ./configure --gcov && make && ./objs/srs_utest && bash auto/coverage.sh
@@ -20,4 +18,3 @@ workflows:
     jobs:
       - build
       - test
-
diff --git a/trunk/auto/coverage.sh b/trunk/auto/coverage.sh
index 5c4760c66..c4313645d 100644
--- a/trunk/auto/coverage.sh
+++ b/trunk/auto/coverage.sh
@@ -9,11 +9,11 @@
 workdir=`pwd`/objs/cover
 
 # Create trunk under workdir.
-mkdir -p $workdir/trunk && cd $workdir/trunk
+mkdir -p $workdir && cd $workdir
 ret=$?; if [[ $ret -ne 0 ]]; then echo "Enter workdir failed, ret=$ret"; exit $ret; fi
 
 # Collect all *.gcno and *.gcda to objs/cover.
-(rm -rf src && cp -R ../../../src . && cp -R ../../src .)
+(rm -rf src && cp -R ../../src . && cp -R ../src .)
 ret=$?; if [[ $ret -ne 0 ]]; then echo "Collect *.gcno and *.gcda failed, ret=$ret"; exit $ret; fi
 
 # Generate *.gcov for coverage.
@@ -23,7 +23,8 @@ for file in `find src -name "*.cpp"|grep -v utest`; do
 done
 
 # Upload report with *.gcov
-cd $workdir/trunk &&
+cd $workdir &&
+find . -name "*.gcov"|grep -v srs|xargs rm -f &&
 export CODECOV_TOKEN="493bba46-c468-4e73-8b45-8cdd8ff62d96" &&
 bash <(curl -s https://codecov.io/bash)
 exit 0