From b6491ab19f76985b0706db41c35e6e57759dce06 Mon Sep 17 00:00:00 2001 From: Ilya Shipitsin Date: Thu, 17 Oct 2024 23:02:39 +0200 Subject: [PATCH] CI: prepare Coverity build for Ubuntu 24 PCRE2 is recommended, PCRE was chosen for no reason. GHA Ubuntu 22 images include both libs, but recent Ubuntu 24 does not. Let us prepare for Ubuntu 24 --- .github/workflows/coverity.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/coverity.yml b/.github/workflows/coverity.yml index 0e7fa07aa..fa28acfc9 100644 --- a/.github/workflows/coverity.yml +++ b/.github/workflows/coverity.yml @@ -23,6 +23,7 @@ jobs: sudo apt-get update -o Acquire::Languages=none -o Acquire::Translation=none sudo apt-get --no-install-recommends -y install \ liblua5.4-dev \ + libpcre2-dev \ libsystemd-dev - name: Install QUICTLS run: | @@ -37,7 +38,7 @@ jobs: - name: Build with Coverity build tool run: | export PATH=`pwd`/coverity_tool/bin:$PATH - cov-build --dir cov-int make CC=clang TARGET=linux-glibc USE_ZLIB=1 USE_PCRE=1 USE_PCRE_JIT=1 USE_LUA=1 USE_OPENSSL=1 USE_QUIC=1 USE_SYSTEMD=1 USE_WURFL=1 WURFL_INC=addons/wurfl/dummy WURFL_LIB=addons/wurfl/dummy USE_DEVICEATLAS=1 DEVICEATLAS_SRC=addons/deviceatlas/dummy USE_51DEGREES=1 51DEGREES_SRC=addons/51degrees/dummy/pattern ADDLIB=\"-Wl,-rpath,$HOME/opt/lib/\" SSL_LIB=${HOME}/opt/lib SSL_INC=${HOME}/opt/include DEBUG+=-DDEBUG_STRICT=1 DEBUG+=-DDEBUG_USE_ABORT=1 + cov-build --dir cov-int make CC=clang TARGET=linux-glibc USE_ZLIB=1 USE_PCRE2=1 USE_PCRE2_JIT=1 USE_LUA=1 USE_OPENSSL=1 USE_QUIC=1 USE_SYSTEMD=1 USE_WURFL=1 WURFL_INC=addons/wurfl/dummy WURFL_LIB=addons/wurfl/dummy USE_DEVICEATLAS=1 DEVICEATLAS_SRC=addons/deviceatlas/dummy USE_51DEGREES=1 51DEGREES_SRC=addons/51degrees/dummy/pattern ADDLIB=\"-Wl,-rpath,$HOME/opt/lib/\" SSL_LIB=${HOME}/opt/lib SSL_INC=${HOME}/opt/include DEBUG+=-DDEBUG_STRICT=1 DEBUG+=-DDEBUG_USE_ABORT=1 - name: Submit build result to Coverity Scan run: | tar czvf cov.tar.gz cov-int