ci: switch to pkgconf on Linux too
And delete dead code
Change-Id: I8e035c0099f4b6679240486afa0775fe558efd1d
diff --git a/.jenkins.d/00-deps.sh b/.jenkins.d/00-deps.sh
index deb3219..7ed8a10 100755
--- a/.jenkins.d/00-deps.sh
+++ b/.jenkins.d/00-deps.sh
@@ -14,21 +14,20 @@
libboost-thread-dev
libsqlite3-dev
libssl-dev
- pkg-config
+ pkgconf
python3
)
+DNF_PKGS=(
+ boost-devel
+ gcc-c++
+ libasan
+ lld
+ openssl-devel
+ pkgconf
+ python3
+ sqlite-devel
+)
FORMULAE=(boost openssl pkgconf)
-PIP_PKGS=()
-case $JOB_NAME in
- *code-coverage)
- APT_PKGS+=(lcov python3-pip)
- PIP_PKGS+=('gcovr~=5.2')
- ;;
- *Docs)
- APT_PKGS+=(python3-pip)
- PIP_PKGS+=(sphinx)
- ;;
-esac
set -x
@@ -43,10 +42,5 @@
sudo apt-get update -qq
sudo apt-get install -qy --no-install-recommends "${APT_PKGS[@]}"
elif [[ $ID_LIKE == *fedora* ]]; then
- sudo dnf install -y gcc-c++ libasan lld pkgconf-pkg-config python3 \
- boost-devel openssl-devel sqlite-devel
-fi
-
-if (( ${#PIP_PKGS[@]} )); then
- pip3 install --user --upgrade --upgrade-strategy=eager "${PIP_PKGS[@]}"
+ sudo dnf install -y "${DNF_PKGS[@]}"
fi