Merge pull request #1223 from chipitsine/master

travis-ci: fix coverity build (broken since 20 Jul 2020)

.ci/coverity.sh

@@ -1,17 +0,0 @@
-#!/bin/sh
-set -eu
-
-RUN_COVERITY="${RUN_COVERITY:-0}"
-
-export COVERITY_SCAN_PROJECT_NAME="SoftEtherVPN/SoftEtherVPN"
-export COVERITY_SCAN_BRANCH_PATTERN="master"
-export COVERITY_SCAN_NOTIFICATION_EMAIL="chipitsine@gmail.com"
-export COVERITY_SCAN_BUILD_COMMAND_PREPEND="./configure"
-export COVERITY_SCAN_BUILD_COMMAND="make -C tmp"
-
-if [ "${RUN_COVERITY}" = "1" ]; then
-    # Ignore exit code, script exits with 1 if we're not on the right branch
-    curl -s "https://scan.coverity.com/scripts/travisci_build_coverity_scan.sh" | bash || true
-else
-    echo "Skipping coverity scan because \$RUN_COVERITY != \"1\""
-fi

.travis.yml

@@ -28,9 +28,19 @@ matrix:
         - ./bootstrap > build-deps.log 2>&1 || (cat build-deps.log && exit 1)
         - sudo make install > build-deps.log 2>&1 || (cat build-deps.log && exit 1)
         - cd ..
-    - env: OPENSSL_VERSION="1.0.2s" RUN_COVERITY="1"
+    - env: OPENSSL_VERSION="1.0.2s" COVERITY_SCAN_PROJECT_NAME="SoftEtherVPN/SoftEtherVPN" COVERITY_SCAN_BRANCH_PATTERN="master" COVERITY_SCAN_NOTIFICATION_EMAIL="chipitsine@gmail.com" COVERITY_SCAN_BUILD_COMMAND_PREPEND="./configure" COVERITY_SCAN_BUILD_COMMAND="make -C build"
       os: linux
       compiler: clang
+      script:
+        - |
+          if [ ! -z ${COVERITY_SCAN_TOKEN+x} ]; then
+            export OPENSSL_ROOT_DIR=${OPENSSL_INSTALL_DIR}
+            export LD_LIBRARY_PATH="${HOME}/opt/lib:${LD_LIBRARY_PATH:-}"
+            export CFLAGS="-I${HOME}/opt/include"
+            export LDFLAGS="-L${HOME}/opt/lib"
+            echo "check_certificate = off" > ~/.wgetrc
+            curl -s "https://scan.coverity.com/scripts/travisci_build_coverity_scan.sh" | bash || true
+          fi
     - env: OPENSSL_VERSION="1.1.1c"
       os: linux
       compiler: clang
@@ -73,7 +83,6 @@ script:
   - export CFLAGS="-I${HOME}/opt/include"
   - export LDFLAGS="-L${HOME}/opt/lib"
   - echo "check_certificate = off" > ~/.wgetrc
-  - .ci/coverity.sh
   - .ci/sonarcloud.sh
   - ./configure
   - make -j $(nproc || sysctl -n hw.ncpu || echo 4) -C build