Skip to content

Commit 537188a

Browse files
committed
tpm1: allow testing tpm1 pin in CI build
Signed-off-by: Oldřich Jedlička <[email protected]>
1 parent 72a6183 commit 537188a

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
matrix:
1818
os:
1919
- fedora:latest
20-
- quay.io/centos/centos:stream10-development
20+
- quay.io/centos/centos:stream10
2121
- quay.io/centos/centos:stream9
2222
- debian:testing
2323
- debian:latest

.github/workflows/install-dependencies

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@ debian:*|ubuntu:*)
2323
while ! apt-get -y install ${COMMON} \
2424
build-essential pkg-config libssl-dev libjansson-dev libjose-dev \
2525
luksmeta libluksmeta-dev libpwquality-tools libglib2.0-dev \
26-
libudisks2-dev libaudit-dev systemd opensc pcscd libsofthsm2-dev; do
26+
libudisks2-dev libaudit-dev systemd opensc pcscd libsofthsm2-dev \
27+
swtpm-tools tpm-tools; do
2728
sleep 5
2829
done
2930
;;
@@ -35,7 +36,7 @@ debian:*|ubuntu:*)
3536
dnf -y install --allowerasing systemd awk
3637
dnf -y --setopt=deltarpm=0 update
3738
dnf -y install dnf-utils jq socat cryptsetup keyutils cracklib-dicts lsof \
38-
opensc pcsc-lite softhsm
39+
opensc pcsc-lite softhsm swtpm-tools tpm-tools trousers
3940
command -v dnf5 && dnf5 -y install dnf5-command\(builddep\) \
4041
|| dnf -y install dnf-command\(builddep\)
4142
dnf -y builddep clevis
@@ -48,11 +49,12 @@ debian:*|ubuntu:*)
4849
yum config-manager -y --set-enabled crb || yum config-manager \
4950
-y --set-enabled powertools || :
5051
yum -y install epel-release
52+
yum -y install epel-next-release || :
5153
yum -y --allowerasing install ${COMMON}
5254
yum -y install pkgconfig openssl-devel openssl zlib-devel \
5355
jansson-devel findutils gcc libjose-devel luksmeta libluksmeta-devel \
5456
audit-libs-devel tpm2-tools desktop-file-utils cracklib-dicts opensc \
55-
pcsc-lite softhsm
57+
pcsc-lite softhsm swtpm-tools tpm-tools trousers
5658
sed -i 's|>=1\.0\.2|>=1\.0\.1|' meson.build
5759
;;
5860
esac

0 commit comments

Comments
 (0)