From d3b2e15d232e0308eca17b5205e2f874d57f4740 Mon Sep 17 00:00:00 2001 From: David Woodhouse Date: Mon, 7 Oct 2019 17:39:49 +0100 Subject: [PATCH] Clean up Coverity curl invocations, stop trying to set PATH Signed-off-by: David Woodhouse --- .gitlab-ci.yml | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d0dcdb83..787247bd 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -99,21 +99,20 @@ Fedora/Coverity: vpnc-script 'pkgconfig(libpskc)' 'pkgconfig(libpcsclite)' tss2-devel java-devel-openjdk glibc-langpack-cs iproute iputils nuttcp 'pkgconfig(tss2-esys)' 'pkgconfig(krb5-gssapi)' 'pkgconfig(libp11)' - - curl -o /tmp/cov-analysis-linux64.tgz https://scan.coverity.com/download/linux64 -d "project=$COVERITY_SCAN_PROJECT_NAME&token=$COVERITY_SCAN_TOKEN" + - curl -o /tmp/cov-analysis-linux64.tgz https://scan.coverity.com/download/linux64 + --form project=$COVERITY_SCAN_PROJECT_NAME --form token=$COVERITY_SCAN_TOKEN" - tar xfz /tmp/cov-analysis-linux64.tgz - - export COVBIN=cov-analysis-linux64-*/bin - - export PATH=`pwd`/$COVBIN:$PATH - - echo $COVBIN - $PATH - ./autogen.sh - ./configure --with-java --without-gnutls --with-openssl --disable-dsa-tests - - cov-build --dir cov-int make -j4 + - cov-analysis-linux64-*/bin/cov-build --dir cov-int make -j4 - make clean - ./configure --with-java --disable-dsa-tests - - cov-build --dir cov-int make -j4 + - cov-analysis-linux64-*/bin/cov-build --dir cov-int make -j4 - tar cfz cov-int.tar.gz cov-int - - curl --form token=$COVERITY_SCAN_TOKEN - --form email=dwmw2@infradead.org --form file=@cov-int.tar.gz --form version="`git describe --tags`" - --form description="CI build" https://scan.coverity.com/builds?project=$COVERITY_SCAN_PROJECT_NAME + - curl https://scan.coverity.com/builds?project=$COVERITY_SCAN_PROJECT_NAME + --form token=$COVERITY_SCAN_TOKEN --form email=dwmw2@infradead.org + --form file=@cov-int.tar.gz --form version="`git describe --tags`" + --form description="CI build" tags: - shared except: -- 2.50.1