From: Tim Duesterhus <tim@bastelstu.be>
Date: Thu, 28 Jan 2021 17:58:53 +0000 (+0100)
Subject: CI: Fix the coverity builds
X-Git-Tag: v2.4-dev7~67
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=66d28e7045459c63e9f5988277926ba74d64697e;p=thirdparty%2Fhaproxy.git

CI: Fix the coverity builds

In an attempt to fix the use of DEBUG_STRICT commit
7f0f4786d1927f1450392e871480e3122796024e unfortunately broke the Coverity
builds completely.

It turns out that Coverity does not properly handle quoting within
`COVERITY_SCAN_BUILD_COMMAND`, instead breaking up single arguments at
whitespace, thus passing `-DDEBUG_USE_ABORT=1` to `make` as-is.

Fix this issue by hijacking the Makefile within the Coverity workflow. We
simply replace the default value of the `DEBUG` option with whatever values we
need. The build command now only includes the TARGET and USE_* flags, each of
which works without any spaces.
---

diff --git a/.github/workflows/coverity.yml b/.github/workflows/coverity.yml
index 78d98bc8ec..4fbe295eb4 100644
--- a/.github/workflows/coverity.yml
+++ b/.github/workflows/coverity.yml
@@ -17,7 +17,7 @@ jobs:
       COVERITY_SCAN_PROJECT_NAME: 'Haproxy'
       COVERITY_SCAN_BRANCH_PATTERN: '*'
       COVERITY_SCAN_NOTIFICATION_EMAIL: 'chipitsine@gmail.com'
-      COVERITY_SCAN_BUILD_COMMAND: "make CC=clang DEBUG='-DDEBUG_STRICT=1 -DDEBUG_USE_ABORT=1' TARGET=linux-glibc USE_ZLIB=1 USE_PCRE=1 USE_PCRE_JIT=1 USE_LUA=1 USE_OPENSSL=1 USE_SYSTEMD=1 USE_WURFL=1 WURFL_INC=contrib/wurfl WURFL_LIB=contrib/wurfl USE_DEVICEATLAS=1 DEVICEATLAS_SRC=contrib/deviceatlas USE_51DEGREES=1 51DEGREES_SRC=contrib/51d/src/pattern"
+      COVERITY_SCAN_BUILD_COMMAND: "make CC=clang TARGET=linux-glibc USE_ZLIB=1 USE_PCRE=1 USE_PCRE_JIT=1 USE_LUA=1 USE_OPENSSL=1 USE_SYSTEMD=1 USE_WURFL=1 WURFL_INC=contrib/wurfl WURFL_LIB=contrib/wurfl USE_DEVICEATLAS=1 DEVICEATLAS_SRC=contrib/deviceatlas USE_51DEGREES=1 51DEGREES_SRC=contrib/51d/src/pattern"
     steps:
     - uses: actions/checkout@v2
     - name: Install apt dependencies
@@ -26,9 +26,16 @@ jobs:
         sudo apt-get install -y \
           liblua5.3-dev \
           libsystemd-dev
+    - name: Hijack Makefile
+      run: |
+        # We cannot pass the DEBUG variable in `COVERITY_SCAN_BUILD_COMMAND`,
+        # because Coverity splits parameters at whitespaces, without taking
+        # quoting into account.
+        sed -i 's/^DEBUG =$/DEBUG = -DDEBUG_STRICT=1 -DDEBUG_USE_ABORT=1/' Makefile
+    - name: Build WURFL
+      run: make -C contrib/wurfl
     - name: Run Coverity Scan
       env:
         COVERITY_SCAN_TOKEN: ${{ secrets.COVERITY_SCAN_TOKEN }}
       run: |
-        make -C contrib/wurfl
         curl -fsSL "https://scan.coverity.com/scripts/travisci_build_coverity_scan.sh" | bash || true