From 1db770a531a1a6b08f4c2644d18d97d4fc97489a Mon Sep 17 00:00:00 2001 From: Juergen Repp Date: Mon, 3 Jun 2024 09:33:49 +0200 Subject: [PATCH] cirrus-ci update image-family to freebsd-14-0 13.2 is apparently no longer available Signed-off-by: Juergen Repp --- .cirrus.yml | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 2b638f8a2..f70928a14 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -6,7 +6,7 @@ task: libusb_version: v1.0.26 freebsd_instance: matrix: - image_family: freebsd-13-2 + image_family: freebsd-14-0 install_script: - IGNORE_OSVERSION=yes - pkg update -f @@ -14,16 +14,7 @@ task: - pkg install -y bash gmake coreutils libtool pkgconf autoconf autoconf-archive - pkg install -y automake openssl json-c cmocka uthash wget curl git util-linux - pkg install -y libftdi1 - - wget --quiet --show-progress --progress=dot:giga "https://downloads.sourceforge.net/project/ibmswtpm2/$ibmtpm_name.tar.gz" - - shasum -a256 $ibmtpm_name.tar.gz | grep ^dd3a4c3f7724243bc9ebcd5c39bbf87b82c696d1c1241cb8e5883534f6e2e327 - - mkdir -p $ibmtpm_name - - tar xvf $ibmtpm_name.tar.gz -C $ibmtpm_name && cd $ibmtpm_name/src - - sed -i '' -e 's/gcc/clang/g' makefile - - sed -i '' -e 's/-Wall //g' makefile - - sed -i '' -e 's/-Werror //g' makefile - - gmake -j && cp tpm_server /usr/bin/ - - cd - - - rm -fr $ibmtpm_name $ibmtpm_name.tar.gz + - pkg install -y swtpm - git clone --depth 1 -b $libusb_version https://github.com/libusb/libusb - cd libusb && ./bootstrap.sh && ./configure && gmake -j install - cd - && rm -fr libusb @@ -32,5 +23,5 @@ task: # Due to a race condition that only occurs in the cirrus ci, "make distcheck" has been replaced by "make check". # ./bootstrap && - ./configure --enable-self-generated-certificate --enable-unit=yes --enable-integration=yes --with-crypto=ossl --disable-doxygen-doc --enable-tcti-swtpm=no --enable-tcti-libtpms=no --enable-tcti-mssim=yes --disable-dependency-tracking && + ./configure --enable-self-generated-certificate --enable-unit=yes --enable-integration=yes --with-crypto=ossl --disable-doxygen-doc --enable-tcti-swtpm=yes --enable-tcti-libtpms=no --enable-tcti-mssim=no --disable-dependency-tracking && gmake -j check || { cat /tmp/cirrus-ci-build/tpm2-tss-*/_build/sub/test-suite.log; exit 1; }