ims-volte-vowifi
/
strongswan
9
0
Fork 0
Code Pull Requests Releases Activity

travis: Bump tpm2-tss to 2.4.1 

Manually built dependencies are now built in a separate step after
packages have been installed as they might depend themselves on some
packages (e.g. tpm2-tss, which now requires libjson-c).
This commit is contained in:
Tobias Brunner 2020-05-25 14:29:44 +02:00
parent 04db34a3a7
commit 0ff939585e
2 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.travis.yml
View File

@ -13,6 +13,7 @@ cache: ccache
before_install: before_install:
- travis_retry ./scripts/test.sh deps - travis_retry ./scripts/test.sh deps
- travis_retry ./scripts/test.sh pydeps - travis_retry ./scripts/test.sh pydeps
- travis_retry ./scripts/test.sh build-deps
before_script: before_script:
- sudo sysctl -w net.ipv6.conf.all.disable_ipv6=0 || true - sudo sysctl -w net.ipv6.conf.all.disable_ipv6=0 || true

24
scripts/test.sh
View File

@ -68,7 +68,7 @@ build_wolfssl()
build_tss2() build_tss2()
{ {
TSS2_REV=2.3.3 TSS2_REV=2.4.1
TSS2_PKG=tpm2-tss-$TSS2_REV TSS2_PKG=tpm2-tss-$TSS2_REV
TSS2_DIR=$DEPS_BUILD_DIR/$TSS2_PKG TSS2_DIR=$DEPS_BUILD_DIR/$TSS2_PKG
TSS2_SRC=https://github.com/tpm2-software/tpm2-tss/releases/download/$TSS2_REV/$TSS2_PKG.tar.gz TSS2_SRC=https://github.com/tpm2-software/tpm2-tss/releases/download/$TSS2_REV/$TSS2_PKG.tar.gz
@ -117,7 +117,7 @@ botan)
CONFIG="--disable-defaults --enable-pki --enable-botan --enable-pem" CONFIG="--disable-defaults --enable-pki --enable-botan --enable-pem"
export TESTS_PLUGINS="test-vectors pem botan!" export TESTS_PLUGINS="test-vectors pem botan!"
DEPS="" DEPS=""
if test "$1" = "deps"; then if test "$1" = "build-deps"; then
build_botan build_botan
fi fi
;; ;;
@ -126,7 +126,7 @@ wolfssl)
export TESTS_PLUGINS="test-vectors pem wolfssl!" export TESTS_PLUGINS="test-vectors pem wolfssl!"
# build with custom options to enable all the features the plugin supports # build with custom options to enable all the features the plugin supports
DEPS="" DEPS=""
if test "$1" = "deps"; then if test "$1" = "build-deps"; then
build_wolfssl build_wolfssl
fi fi
;; ;;
@ -161,7 +161,7 @@ all|coverage|sonarcloud)
libpcsclite-dev libpam0g-dev binutils-dev libnm-dev libgcrypt20-dev libpcsclite-dev libpam0g-dev binutils-dev libnm-dev libgcrypt20-dev
libjson-c-dev iptables-dev python-pip libtspi-dev libsystemd-dev" libjson-c-dev iptables-dev python-pip libtspi-dev libsystemd-dev"
PYDEPS="tox" PYDEPS="tox"
if test "$1" = "deps"; then if test "$1" = "build-deps"; then
if test -z "$UBUNTU_XENIAL"; then if test -z "$UBUNTU_XENIAL"; then
build_botan build_botan
fi fi
@ -363,7 +363,8 @@ lgtm)
;; ;;
esac esac
if test "$1" = "deps"; then case "$1" in
deps)
case "$TRAVIS_OS_NAME" in case "$TRAVIS_OS_NAME" in
linux) linux)
sudo apt-get update -qq && \ sudo apt-get update -qq && \
@ -379,12 +380,17 @@ if test "$1" = "deps"; then
;; ;;
esac esac
exit $? exit $?
fi ;;
pydeps)
if test "$1" = "pydeps"; then
test -z "$PYDEPS" || pip -q install --user $PYDEPS test -z "$PYDEPS" || pip -q install --user $PYDEPS
exit $? exit $?
fi ;;
build-deps)
exit
;;
*)
;;
esac
CONFIG="$CONFIG CONFIG="$CONFIG
--disable-dependency-tracking --disable-dependency-tracking