From 594c478482237e191bf218b5cd29bd66c1ec809d Mon Sep 17 00:00:00 2001
From: Nicolas Williams <nico@twosigma.com>
Date: Mon, 2 Jan 2023 21:51:36 -0600
Subject: [PATCH] GHA: Fix Coverity build

---
 .github/workflows/coverity.yml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/coverity.yml b/.github/workflows/coverity.yml
index 5a175f52a..dfea060d0 100644
--- a/.github/workflows/coverity.yml
+++ b/.github/workflows/coverity.yml
@@ -8,7 +8,7 @@ on:
 
 jobs:
     linux:
-        if: secrets.COVERITY_SCAN_TOKEN != ''
+        #if: ${{ secrets.COVERITY_SCAN_TOKEN }} != ''
         runs-on: ${{ matrix.os }}
         strategy:
             fail-fast: false
@@ -32,8 +32,9 @@ jobs:
             - name: Download Coverity Build Tool
               env:
                   TOKEN: ${{ secrets.COVERITY_SCAN_TOKEN }}
+                  PROJECT: ${{ secrets.COVERITY_SCAN_PROJECT }}
               run: |
-                  wget -q https://scan.coverity.com/download/cxx/linux64 --post-data "token=$TOKEN&project=ruby" -O cov-analysis-linux64.tar.gz
+                  wget -q https://scan.coverity.com/download/cxx/linux64 --post-data "token=$TOKEN&project=$PROJECT" -O cov-analysis-linux64.tar.gz
                   mkdir cov-analysis-linux64
                   tar xzf cov-analysis-linux64.tar.gz --strip 1 -C cov-analysis-linux64
             - name: Build
@@ -43,6 +44,7 @@ jobs:
                 CONFIGURE_OPTS:  ${{ matrix.configureopts }}
               run: |
                 /bin/sh ./autogen.sh
+                export PATH="$PWD/cov-analysis-linux64/bin:$PATH"
                 mkdir build
                 cd build
                 ../configure --srcdir=`dirname "$PWD"` --enable-maintainer-mode --enable-developer --with-ldap $CONFIGURE_OPTS --prefix=$HOME/inst CFLAGS="-Wno-error=shadow -Wno-error=bad-function-cast -Wno-error=unused-function -Wno-error=unused-result -Wno-error=deprecated-declarations"
@@ -50,19 +52,17 @@ jobs:
                 # We don't want to scan-build libedit nor SQLite3 because ETOOSLOW
                 (cd lib/libedit && make -j4)
                 (cd lib/sqlite && make -j4)
-                export PATH=`pwd`/cov-analysis-linux64/bin:$PATH
                 cov-build --dir cov-int make -j4
+                tar czvf ../heimdal.tgz cov-int
             - name: Submit the result to Coverity Scan
               env:
                   TOKEN: ${{ secrets.COVERITY_SCAN_TOKEN }}
                   EMAIL: ${{ secrets.COVERITY_SCAN_EMAIL }}
                   PROJECT: ${{ secrets.COVERITY_SCAN_PROJECT }}
               run: |
-                  tar czvf heimdal.tgz cov-int
                   curl \
-                  --form project=ruby \
-                  --form token=$TOKEN \
-                  --form email=$EMAIL \
-                  --form file=@heimdal.tgz \
-                  --form version=trunk \
-                  --form description="`./ruby -v`" "https://scan.coverity.com/builds?project=$PROJECT"
+                  --form "token=$TOKEN" \
+                  --form "email=$EMAIL" \
+                  --form "file=@heimdal.tgz" \
+                  --form version="$(git rev-parse HEAD)" \
+                  --form description="$GITHUB_REF / $GITHUB_SHA" "https://scan.coverity.com/builds?project=$PROJECT"