From 98dc6c044c58a16d272767a6f9b08d033e171062 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Old=C5=99ich=20Jedli=C4=8Dka?= Date: Wed, 2 Oct 2024 09:42:31 +0200 Subject: [PATCH] tpm1: allow testing tpm1 pin in CI build (CentOS) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit TPM 1.2 SW tests on CentOS 9+ are not supported by RedHat (see [1]), but packages are installed and tests detect this. CentOS 10 EPEL does not yet exist, so required packages cannot be installed. [1] https://bugzilla.redhat.com/show_bug.cgi?id=1990153 Signed-off-by: Oldřich Jedlička --- .github/workflows/install-dependencies | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/install-dependencies b/.github/workflows/install-dependencies index 5b321513..9ffeffd2 100755 --- a/.github/workflows/install-dependencies +++ b/.github/workflows/install-dependencies @@ -46,12 +46,18 @@ debian:*|ubuntu:*) yum install -y yum-utils yum config-manager -y --set-enabled crb || yum config-manager \ -y --set-enabled powertools || : - yum -y install epel-release + yum -y install epel-release epel-next-release yum -y --allowerasing install ${COMMON} yum -y install pkgconfig openssl-devel openssl zlib-devel \ jansson-devel findutils gcc libjose-devel luksmeta libluksmeta-devel \ audit-libs-devel tpm2-tools desktop-file-utils cracklib-dicts opensc \ - pcsc-lite softhsm + pcsc-lite softhsm swtpm-tools + # EPEL-specific packages, EPEL 10 does not exist yet + case "${DISTRO}" in + *centos:*-development) ;; + *) yum -y install tpm-tools trousers + ;; + esac sed -i 's|>=1\.0\.2|>=1\.0\.1|' meson.build ;; esac