Jakub Jelen 2021-05-06 10:26:15 +02:00 committed by Frank Morgner
parent 613b56ee55
commit 2f145f5804
1 changed files with 29 additions and 21 deletions

View File

@ -51,27 +51,29 @@ env:
- COVERITY_SCAN_PROJECT_NAME="$TRAVIS_REPO_SLUG" - COVERITY_SCAN_PROJECT_NAME="$TRAVIS_REPO_SLUG"
- SOURCE_DATE_EPOCH=$(git log -1 --pretty=%ct) - SOURCE_DATE_EPOCH=$(git log -1 --pretty=%ct)
addons: # Commented out because of a bug in travis images for Focal:
apt_packages: # https://travis-ci.community/t/clang-10-was-recently-broken-on-linux-unmet-dependencies-for-clang-10-clang-tidy-10-valgrind/11527
- binutils-mingw-w64-i686 #addons:
- binutils-mingw-w64-x86-64 # apt_packages:
- docbook-xsl # - binutils-mingw-w64-i686
- gcc-mingw-w64-i686 # - binutils-mingw-w64-x86-64
- gcc-mingw-w64-x86-64 # - docbook-xsl
- libpcsclite-dev # - gcc-mingw-w64-i686
- mingw-w64 # - gcc-mingw-w64-x86-64
- xsltproc # - libpcsclite-dev
- gengetopt # - mingw-w64
- libcmocka-dev # - xsltproc
- help2man # - gengetopt
- pcscd # - libcmocka-dev
- pcsc-tools # - help2man
- check # - pcscd
- ant # - pcsc-tools
- socat # - check
- cmake # - ant
- clang-tidy # - socat
- softhsm2 # - cmake
# - clang-tidy
# - softhsm2
before_install: before_install:
# homebrew is dead slow in older images due to the many updates it would need to download and build. # homebrew is dead slow in older images due to the many updates it would need to download and build.
@ -114,6 +116,12 @@ before_install:
- if [ -n "${HOST}" ]; then - if [ -n "${HOST}" ]; then
sudo apt-get install -y wine; sudo apt-get install -y wine;
fi fi
- if [ "$TRAVIS_DIST" == "focal" ]; then
sudo apt-get install -yq --allow-downgrades libc6=2.31-0ubuntu9.2 libc6-dev=2.31-0ubuntu9.2;
fi
- if [ "$TRAVIS_OS_NAME" == "linux" ]; then
sudo -E apt-get -yq --no-install-suggests --no-install-recommends --allow-downgrades --allow-remove-essential --allow-change-held-packages install binutils-mingw-w64-i686 binutils-mingw-w64-x86-64 docbook-xsl gcc-mingw-w64-i686 gcc-mingw-w64-x86-64 libpcsclite-dev mingw-w64 xsltproc gengetopt libcmocka-dev help2man pcscd pcsc-tools check ant socat cmake clang-tidy softhsm2;
fi
before_script: before_script:
- if [ "$TRAVIS_BRANCH" = "master" -a "$TRAVIS_PULL_REQUEST" = "false" ]; then - if [ "$TRAVIS_BRANCH" = "master" -a "$TRAVIS_PULL_REQUEST" = "false" ]; then