Update coverity ci action yml and working sh script

mne-tools · Apr 25, 2023 · 0bfd48e · 0bfd48e
1 parent 1612c78
commit 0bfd48e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 43 deletions.
diff --git a/.github/workflows/coverity.yml b/.github/workflows/coverity.yml
@@ -21,44 +21,6 @@ jobs:
           modules: qtcharts
       - name: Coverity scripts
         run: |
-          COVERITY_SCAN_PROJECT_NAME="mne-tools/mne-cpp"
-          COVERITY_SCAN_NOTIFICATION_EMAIL="mne_cpp@googlegroups.com"
-          COVERITY_SCAN_BRANCH_PATTERN="main"
-          COVERITY_SCAN_BUILD_COMMAND_PREPEND="cmake -B build -S src -DCMAKE_BUILD_TYPE=Release"
-          COVERITY_SCAN_BUILD_COMMAND="cmake --build build"
-          COVERITY_SCAN_TOKEN=$COVTOKEN
-          PLATFORM=`uname`
-          TOOL_ARCHIVE=/tmp/cov-analysis-${PLATFORM}.tgz
-          TOOL_URL=https://scan.coverity.com/download/${PLATFORM}
-          TOOL_BASE=/tmp/coverity-scan-analysis
-          UPLOAD_URL="https://scan.coverity.com/builds?project=mne-tools%2Fmne-cpp"
-          SCAN_URL="https://scan.coverity.com"
-          wget -nv -O $TOOL_ARCHIVE $TOOL_URL --post-data "project=$COVERITY_SCAN_PROJECT_NAME&token=$COVERITY_SCAN_TOKEN"
-          mkdir -p $TOOL_BASE
-          pushd $TOOL_BASE
-          tar xzf $TOOL_ARCHIVE --warning=none
-          popd
-          TOOL_DIR=`find $TOOL_BASE -type d -name 'cov-analysis*'`
-          export PATH=$TOOL_DIR/bin:$PATH
-          echo -e "echo 3"
-          echo -e "\033[33;1mRunning Coverity Scan Analysis Tool...\033[0m"
-          COV_BUILD_OPTIONS=""
-          RESULTS_DIR="cov-int"
-          eval "${COVERITY_SCAN_BUILD_COMMAND_PREPEND}"
-          COVERITY_UNSUPPORTED=1 cov-build --dir $RESULTS_DIR $COV_BUILD_OPTIONS $COVERITY_SCAN_BUILD_COMMAND
-          cov-import-scm --dir $RESULTS_DIR --scm git --log $RESULTS_DIR/scm_log.txt 2>&1
-          RESULTS_ARCHIVE=analysis-results.tgz
-          tar czf $RESULTS_ARCHIVE $RESULTS_DIR
-          SHA=`git rev-parse --short HEAD`
-          response=$(curl \
-            --silent --write-out "\n%{http_code}\n" \
-            --form token=$COVERITY_SCAN_TOKEN \
-            --form email=$COVERITY_SCAN_NOTIFICATION_EMAIL \
-            --form file=@$RESULTS_ARCHIVE \
-            --form version=$SHA \
-            --form description="Github Actions build" \
-            $UPLOAD_URL)
-          echo "$response"
-          status_code=$(echo "$response" | sed -n '$p')
+          ./tools/coverity_scan.sh "$COVTOKEN"
         env:
           COVTOKEN: ${{ secrets.COVERITY_TOKEN }}
diff --git a/tools/coverity_scan.sh b/tools/coverity_scan.sh
@@ -22,8 +22,8 @@ echo -e "Coverity working path: ${COV_WORKING_PATH}"
 COVERITY_SCAN_PROJECT_NAME="mne-tools/mne-cpp"
 COVERITY_SCAN_NOTIFICATION_EMAIL="mne_cpp@googlegroups.com"
 COVERITY_SCAN_BRANCH_PATTERN="main"
-COVERITY_SCAN_BUILD_COMMAND_PREPEND="cmake -B build -S src -DCMAKE_BUILD_TYPE=Release"
-COVERITY_SCAN_BUILD_COMMAND="cmake --build build"
+COVERITY_SCAN_BUILD_COMMAND_PREPEND="cmake -B ${BaseFolder}/build -S ${BaseFolder}/src -DCMAKE_BUILD_TYPE=Release"
+COVERITY_SCAN_BUILD_COMMAND="cmake --build ${BaseFolder}/build"
 COVERITY_SCAN_TOKEN=$1
 
 echo -e "Build commands: "
@@ -63,7 +63,7 @@ echo -e "Found tool directory: ${TOOL_DIR}"
 echo -e "\033[33;1mRunning Coverity Scan Analysis Tool...\033[0m"
 
 COV_BUILD_OPTIONS=""
-RESULTS_DIR="${COV_WORKING_PATH}/cov-int"
+RESULTS_DIR="cov-int"
 
 echo -e "Building..."
 eval "${COVERITY_SCAN_BUILD_COMMAND_PREPEND}"
@@ -73,7 +73,7 @@ cov-import-scm --dir $RESULTS_DIR --scm git --log $RESULTS_DIR/scm_log.txt 2>&1
 RESULTS_ARCHIVE='analysis-results.tgz'
 
 echo -e "Zipping results..."
-tar czf $RESULTS_ARCHIVE $RESULTS_DIR
+tar czf $RESULTS_ARCHIVE $RESULTS_DIR 
 echo -e "Zipping done."
 
 SHA=`git rev-parse --short HEAD`