From da443fa10c2d815b1e6e602dbae80f68b8f2afac Mon Sep 17 00:00:00 2001 From: Goetz Goerisch Date: Sat, 9 Nov 2024 02:24:45 +0100 Subject: [PATCH] fix(ci): set different version to TPM2 depending on ubuntu variant Signed-off-by: Goetz Goerisch --- .github/workflows/build_linux.yml | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build_linux.yml b/.github/workflows/build_linux.yml index 2fdd1438b78..8ceeadc5dbe 100644 --- a/.github/workflows/build_linux.yml +++ b/.github/workflows/build_linux.yml @@ -24,9 +24,9 @@ jobs: "PubSub SKS Build & Unit Tests (gcc)", "Encryption (OpenSSL) Build & Unit Tests (gcc)", "Encryption (LibreSSL) Build & Unit Tests (gcc)", - "TPM Tool Build 20.04", - "TPM Tool Build 22.04", - "TPM Tool Build 24.04", + "TPM Tool Build ubuntu-20.04", + "TPM Tool Build ubuntu-22.04", + "TPM Tool Build ubuntu-24.04", "Release Build", "Amalgamation Build", "Amalgamation Build with Multithreading", @@ -97,14 +97,14 @@ jobs: ./configure sudo make install cmd_action: unit_tests_encryption LIBRESSL - - build_name: "TPM Tool Build 20.04" + - build_name: "TPM Tool Build ubuntu-20.04" runs_on: "ubuntu-20.04" cmd_deps: | sudo apt-get install -y -qq acl autoconf autoconf-archive automake build-essential cmake doxygen gcc git iproute2 libcurl4-openssl-dev libjson-c-dev libcmocka0 libcmocka-dev libgcrypt20-dev libglib2.0-dev libini-config-dev libmbedtls-dev libssl-dev libsqlite3-dev libtool libyaml-dev pkg-config procps python3-pip sqlite3 udev uthash-dev cd ${HOME} git clone https://github.com/tpm2-software/tpm2-tss.git cd ${HOME}/tpm2-tss - git checkout 3.2.2 + git checkout 3.2.3 ./bootstrap && ./configure --with-udevrulesdir=/etc/udev/rules.d --with-udevrulesprefix=70- make -j$(nproc) sudo make install @@ -124,14 +124,14 @@ jobs: sudo pip3 install pyasn1_modules pip3 install . cmd_action: build_tpm_tool - - build_name: "TPM Tool Build 22.04" + - build_name: "TPM Tool Build ubuntu-22.04" runs_on: "ubuntu-22.04" cmd_deps: | sudo apt-get install -y -qq acl autoconf autoconf-archive automake build-essential cmake doxygen gcc git iproute2 libcurl4-openssl-dev libjson-c-dev libcmocka0 libcmocka-dev libgcrypt20-dev libglib2.0-dev libini-config-dev libmbedtls-dev libssl-dev libsqlite3-dev libtool libyaml-dev pkg-config procps python3-pip sqlite3 udev uthash-dev cd ${HOME} git clone https://github.com/tpm2-software/tpm2-tss.git cd ${HOME}/tpm2-tss - git checkout 3.2.2 + git checkout 3.2.3 ./bootstrap && ./configure --with-udevrulesdir=/etc/udev/rules.d --with-udevrulesprefix=70- make -j$(nproc) sudo make install @@ -151,24 +151,24 @@ jobs: sudo pip3 install pyasn1_modules pip3 install . cmd_action: build_tpm_tool - - build_name: "TPM Tool Build 24.04" + - build_name: "TPM Tool Build ubuntu-24.04" runs_on: "ubuntu-24.04" cmd_deps: | - sudo apt-get install -y -qq acl autoconf autoconf-archive automake build-essential cmake doxygen gcc git iproute2 libcurl4-openssl-dev libjson-c-dev libcmocka0 libcmocka-dev libgcrypt20-dev libglib2.0-dev libini-config-dev libmbedtls-dev libssl-dev libsqlite3-dev libtool libyaml-dev pkg-config procps python3-pip sqlite3 udev uthash-dev + sudo apt-get install -y -qq acl autoconf autoconf-archive automake build-essential cmake doxygen gcc git iproute2 libcurl4-openssl-dev libjson-c-dev libcmocka0 libcmocka-dev libgcrypt20-dev libglib2.0-dev libini-config-dev libmbedtls-dev libssl-dev libsqlite3-dev libtool libyaml-dev pkg-config procps python3-pip sqlite3 udev uthash-dev libltdl-dev cd ${HOME} git clone https://github.com/tpm2-software/tpm2-tss.git cd ${HOME}/tpm2-tss - git checkout e96b0197531233999e5e27c45d4d979d09860028 + git checkout 4.1.3 ./bootstrap && ./configure --with-udevrulesdir=/etc/udev/rules.d --with-udevrulesprefix=70- make -j$(nproc) sudo make install sudo ldconfig sudo udevadm control --reload-rules && sudo udevadm trigger - sudo apt-get install -y -qq tpm2-tools opensc + sudo apt-get install -y -qq tpm2-tools python3-tpm2-pytss opensc cd ${HOME} git clone https://github.com/tpm2-software/tpm2-pkcs11.git cd ${HOME}/tpm2-pkcs11 - git checkout 1.7.0 + git checkout 1.9.1 ./bootstrap && ./configure make -j$(nproc) sudo make install @@ -177,6 +177,7 @@ jobs: cd ${HOME}/tpm2-pkcs11/tools/ sudo pip3 install pyasn1_modules pip3 install . + cmd_action: build_tpm_tool - build_name: "Release Build" cmd_deps: sudo apt-get install -y -qq libmbedtls-dev cmd_action: build_release