Do not need to waste CPU cycles and time to install swtpm in CI container if distribution does not have tssstartup, because we will be not able to start it. Signed-off-by: Vitaly Chikunov <vt@xxxxxxxxxxxx> --- .github/workflows/ci.yml | 8 +++++++- .travis.yml | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git .github/workflows/ci.yml .github/workflows/ci.yml index f08733a..2e0b1b0 100644 --- .github/workflows/ci.yml +++ .github/workflows/ci.yml @@ -112,7 +112,13 @@ jobs: ARCH="$ARCH" CC="$CC" TSS="$TSS" ./ci/$INSTALL.sh - name: Build swtpm - run: if [ ! "$VARIANT" ]; then which tpm_server || which swtpm || ./tests/install-swtpm.sh; fi + run: | + if [ ! "$VARIANT" ]; then + which tpm_server || which swtpm || \ + if which tssstartup; then + ./tests/install-swtpm.sh; + fi + fi - name: Compiler version run: $CC --version diff --git .travis.yml .travis.yml index 5b07711..94fbb94 100644 --- .travis.yml +++ .travis.yml @@ -93,4 +93,4 @@ before_install: script: - INSTALL="${DISTRO%%:*}" - INSTALL="${INSTALL%%/*}" - - $CONTAINER run $CONTAINER_ARGS -t ima-evm-utils /bin/sh -c "if [ \"$VARIANT\" ]; then ARCH=\"$ARCH\" ./ci/$INSTALL.$VARIANT.sh; fi && ARCH=\"$ARCH\" CC=\"$CC\" TSS=\"$TSS\" ./ci/$INSTALL.sh && if [ ! \"$VARIANT\" ]; then which tpm_server || which swtpm || ./tests/install-swtpm.sh; fi && CC=\"$CC\" VARIANT=\"$VARIANT\" ./build.sh" + - $CONTAINER run $CONTAINER_ARGS -t ima-evm-utils /bin/sh -c "if [ \"$VARIANT\" ]; then ARCH=\"$ARCH\" ./ci/$INSTALL.$VARIANT.sh; fi && ARCH=\"$ARCH\" CC=\"$CC\" TSS=\"$TSS\" ./ci/$INSTALL.sh && if [ ! \"$VARIANT\" ]; then which tpm_server || which swtpm || if which tssstartup; then ./tests/install-swtpm.sh; fi; fi && CC=\"$CC\" VARIANT=\"$VARIANT\" ./build.sh" -- 2.29.3