travis-ci: add arm64, s390x builds.
PATCH v3 1/1 travis-ci: add arm64, s390x builds.
From: Ilya Shipitsin <[email protected]...>
as described on https://docs.travis-ci.com/user/multi-cpu-architectures travis-ci now supports amd64, ppcle, arm64, s390 architectures. Add arm64 and s390x.
travis-ci images were upgraded to bionic.
"sudo" is deprecated, let us remove it, also "matrix" is deprecated in favour of "jobs".
LD_LIBRARY_PATH was replaced by using "rpath" in LDFLAGS, which is more elegant way of linking.
also, dependencies were upgraded to the latest versions.
travis_wait was added for long openssl builds.
cmocka was added to linux and osx builds.
---
v3 resolved travis_wait output redirection issue, now it works as expected. I had to specify "names" for jobs, without names travis puts secure variable as job name
v2 rebased against proper commit
.travis.yml | 87 +++++++++++++++++++++++++-------------- .travis/build-check.sh | 10 +---- .travis/build-deps.sh | 10 +++-- .travis/run-build-deps.sh | 10 ----- 4 files changed, 62 insertions(+), 55 deletions(-) delete mode 100755 .travis/run-build-deps.sh
.travis.yml +55 -32
@@ -1,5 +1,4 @@ -sudo: required -dist: xenial +dist: bionic os: linux
@@ -11,86 +10,111 @@ env: - PREFIX="${HOME}/opt" - TAP_WINDOWS_VERSION=9.23.3 - LZO_VERSION=2.10 - - PKCS11_HELPER_VERSION=1.25.1 - - MBEDTLS_VERSION=2.16.1 + - PKCS11_HELPER_VERSION=1.26 + - MBEDTLS_VERSION=2.16.4 - MBEDTLS_CFLAGS="-I${PREFIX}/include" - MBEDTLS_LIBS="-L${PREFIX}/lib -lmbedtls -lmbedx509 -lmbedcrypto" - - OPENSSL_VERSION=1.0.2s + - OPENSSL_VERSION=1.0.2u - OPENSSL_CFLAGS="-I${PREFIX}/include" - OPENSSL_LIBS="-L${PREFIX}/lib -lssl -lcrypto" # The next declaration is the encrypted COVERITY_SCAN_TOKEN, created # via the "travis encrypt" command using the project repo's public key - secure: "l9mSnEW4LJqjxftH5i1NdDaYfGmQB1mPXnSB3DXnsjzkCWZ+yJLfBemfQ0tx/wS7chBYxqUaUIMT0hw4zJVp/LANFJo2vfh//ymTS6h0uApRY1ofg9Pp1BFcV1laG6/u8pwSZ2EBy/GhCd3DS436oE8sYBRaFM9FU62L/oeQBfJ7r4ID/0eB1b8bqlbD4paty9MHui2P8EZJwR+KAD84prtfpZOcrSMxPh9OUhJxzxUvvVoP4s4+lZ5Kgg1bBQ3yzKGDqe8VOgK2BWCEuezqhMMc8oeKmAe7CUkoz5gsGYH++k3I9XzP9Z4xeJKoQnC/82qi4xkJmlaOxdionej9bHIcjfRt7D8j1J0U+wOj4p8VrDy7yHaxuN2fi0K5MGa/CaXQSrkna8dePniCng+xQ2MY/zxuRX2gA6xPNLUyQLU9LqIug7wj4z84Hk9iWib4L20MoPjeEo+vAUNq8FtjOPxMuHNpv4iGGx6kgJm7RXl5vC5hxfK6MprrnYe2U5Mcd8jpzagKBaKHL3zV2FxX9k0jRO9Mccz7M2WnaV0MQ6zcngzTN4+s0kCjhfGKd2F2ANT2Gkhj3Me36eNHfuE0dBbvYCMh4b3Mgd7b/OuXwQWdJ8PjJ1WHXjSOw5sHw1suaV6cEO2Meyz5j1tOkyOi0M9QF+LFenQ9vLH4sBCww8U=" -matrix: +jobs: include: - - env: + - name: cl + env: - SSLLIB="openssl" - OPENSSL_VERSION="1.1.1d" - P7Z="c:\Program Files\7-Zip\7z.exe" - CC="cl" os: windows compiler: cl - - env: SSLLIB="openssl" RUN_COVERITY="1" + - name: Coverity scan + env: SSLLIB="openssl" RUN_COVERITY="1" os: linux compiler: gcc - - env: SSLLIB="openssl" OPENSSL_VERSION="1.0.1u" + - name: gcc | openssl-1.0.1u + env: SSLLIB="openssl" OPENSSL_VERSION="1.0.1u" os: linux compiler: gcc - - env: SSLLIB="openssl" OPENSSL_VERSION="1.1.1c" + - name: gcc | openssl-1.1.1d + env: SSLLIB="openssl" OPENSSL_VERSION="1.1.1d" os: linux + arch: amd64 compiler: gcc - - env: SSLLIB="openssl" OPENSSL_VERSION="1.1.1c" LABEL="linux-ppc64le" - os: linux-ppc64le + - name: gcc | openssl-1.1.1d + env: SSLLIB="openssl" OPENSSL_VERSION="1.1.1d" + os: linux + arch: ppc64le + compiler: gcc + - name: gcc | openssl-1.1.1d + env: SSLLIB="openssl" OPENSSL_VERSION="1.1.1d" + os: linux + arch: arm64 + compiler: gcc + - name: gcc | openssl-1.1.1d + env: SSLLIB="openssl" OPENSSL_VERSION="1.1.1d" + os: linux + arch: s390x compiler: gcc - - env: SSLLIB="openssl" EXTRA_CONFIG="--enable-iproute2" + - name: gcc | openssl-1.0.2u | iproute2 + env: SSLLIB="openssl" EXTRA_CONFIG="--enable-iproute2" os: linux compiler: gcc - - env: SSLLIB="openssl" CFLAGS="-fsanitize=address" CC=clang-9 + - name: clang+asan | openssl-1.0.2u + env: SSLLIB="openssl" CFLAGS="-fsanitize=address" CC=clang-9 os: linux compiler: clang - - env: SSLLIB="openssl" OPENSSL_VERSION="1.1.1c" CC=clang-9 + - name: clang | openssl-1.1.1d + env: SSLLIB="openssl" OPENSSL_VERSION="1.1.1d" CC=clang-9 os: linux compiler: clang - - env: SSLLIB="mbedtls" + - name: gcc | mbedtls + env: SSLLIB="mbedtls" os: linux compiler: gcc - - env: SSLLIB="mbedtls" CFLAGS="-fsanitize=address" CC=clang-9 + - name: clang+asan | mbedtls + env: SSLLIB="mbedtls" CFLAGS="-fsanitize=address" CC=clang-9 os: linux compiler: clang - - env: SSLLIB="openssl" + - name: clang | openssl-1.0.2u + env: SSLLIB="openssl" os: osx compiler: clang - - env: SSLLIB="mbedtls" + - name: clang | mbedtls + env: SSLLIB="mbedtls" os: osx compiler: clang - - env: SSLLIB="openssl" CHOST=x86_64-w64-mingw32 OPENSSL_VERSION="1.0.1u" + - name: mingw64 | openssl-1.0.1u + env: SSLLIB="openssl" CHOST=x86_64-w64-mingw32 OPENSSL_VERSION="1.0.1u" os: linux compiler: ": Win64 build only" - - env: SSLLIB="openssl" CHOST=x86_64-w64-mingw32 OPENSSL_VERSION="1.1.1c" + - name: mingw64 | openssl-1.1.1d + env: SSLLIB="openssl" CHOST=x86_64-w64-mingw32 OPENSSL_VERSION="1.1.1d" os: linux compiler: ": Win64 build only" - - env: SSLLIB="openssl" CHOST=i686-w64-mingw32 + - name: mingw32 | openssl-1.0.2u + env: SSLLIB="openssl" CHOST=i686-w64-mingw32 os: linux compiler: ": Win32 build only" - - env: SSLLIB="openssl" EXTRA_CONFIG="--disable-lzo" EXTRA_SCRIPT="make distcheck" CC=clang-9 + - name: clang | openssl-1.0.2u | disable-lzo | distcheck + env: SSLLIB="openssl" EXTRA_CONFIG="--disable-lzo" EXTRA_SCRIPT="make distcheck" CC=clang-9 os: linux compiler: clang - - env: SSLLIB="openssl" EXTRA_CONFIG="--enable-small" CC=clang-9 + - name: clang | openssl-1.0.2u | enable-small + env: SSLLIB="openssl" EXTRA_CONFIG="--enable-small" CC=clang-9 os: linux compiler: clang addons: apt: - sources: - - ubuntu-toolchain-r-test - - sourceline: 'deb https://apt.llvm.org/xenial/ llvm-toolchain-xenial-9 main' - key_url: 'https://apt.llvm.org/llvm-snapshot.gpg.key' update: true - packages: [ liblzo2-dev, libpam0g-dev, liblz4-dev, linux-libc-dev, man2html, mingw-w64 ] + packages: [ liblzo2-dev, libpam0g-dev, liblz4-dev, linux-libc-dev, man2html, mingw-w64, clang-9, libcmocka-dev ] homebrew: update: true - packages: [ lzo ] + packages: [ lzo, lz4, cmocka ] cache: directories:
@@ -99,9 +123,8 @@ cache: - ${HOME}/Library/Caches/Homebrew install: - - if [ "$TRAVIS_OS_NAME" = "linux" ] && [ "$TRAVIS_CPU_ARCH" != "ppc64le" ]; then sudo apt-get install clang-9; fi - if [ ! -z "${CHOST}" ]; then unset CC; fi - - .travis/run-build-deps.sh + - travis_wait 30 bash -c '.travis/build-deps.sh > build-deps.log 2>&1' || (cat build-deps.log && exit 1) before_script: - .travis/coverity.sh
.travis/build-check.sh +1 -9
@@ -6,14 +6,6 @@ if [ "${TRAVIS_OS_NAME}" = "windows" ]; then MSBuild.exe openvpn.sln //p:Platform=x64 && exit 0 fi -if [ "${TRAVIS_OS_NAME}" = "linux" ]; then - export LD_LIBRARY_PATH="${PREFIX}/lib:${LD_LIBRARY_PATH:-}" -fi - -if [ "${TRAVIS_OS_NAME}" = "osx" ]; then - export DYLD_LIBRARY_PATH="${PREFIX}/lib:${DYLD_LIBRARY_PATH:-}" -fi - autoreconf -vi if [ -z ${CHOST+x} ]; then
@@ -21,7 +13,7 @@ if [ -z ${CHOST+x} ]; then export EXTRA_CONFIG="${EXTRA_CONFIG:-} --enable-werror" fi ./configure --with-crypto-library="${SSLLIB}" ${EXTRA_CONFIG:-} || (cat config.log && exit 1) - make -j$JOBS + make LDFLAGS="-Wl,-rpath,${PREFIX}/lib" -j$JOBS src/openvpn/openvpn --version || true if [ "${TRAVIS_OS_NAME}" = "linux" ]; then ldd src/openvpn/openvpn;
.travis/build-deps.sh +6 -4
@@ -44,17 +44,19 @@ build_lzo () { } download_pkcs11_helper () { - if [ ! -f "pkcs11-helper-${PKCS11_HELPER_VERSION}.tar.bz2" ]; then + if [ ! -f "pkcs11-helper-${PKCS11_HELPER_VERSION}.tar.gz" ]; then wget -P download-cache/ \ - "https://github.com/OpenSC/pkcs11-helper/releases/download/pkcs11-helper-${PKCS11_HELPER_VERSION}/pkcs11-helper-${PKCS11_HELPER_VERSION}.tar.bz2" + "https://github.com/OpenSC/pkcs11-helper/archive/pkcs11-helper-${PKCS11_HELPER_VERSION}.tar.gz" fi } build_pkcs11_helper () { if [ "$(cat ${PREFIX}/.pkcs11_helper-version)" != "${PKCS11_HELPER_VERSION}" ]; then - tar jxf download-cache/pkcs11-helper-${PKCS11_HELPER_VERSION}.tar.bz2 + tar xf download-cache/pkcs11-helper-${PKCS11_HELPER_VERSION}.tar.gz ( - cd "pkcs11-helper-${PKCS11_HELPER_VERSION}" + cd "pkcs11-helper-pkcs11-helper-${PKCS11_HELPER_VERSION}" + + autoreconf -iv ./configure --host=${CHOST} --program-prefix='' --libdir=${PREFIX}/lib \ --prefix=${PREFIX} --build=x86_64-pc-linux-gnu \
.travis/run-build-deps.sh deleted +0 -10
@@ -1,10 +0,0 @@ -#!/bin/sh -set -eux - -if [ "${TRAVIS_OS_NAME}" = "windows" ]; then - # for windows we need to print output since openssl build - # might take more than 10 minutes, which causes build abort - .travis/build-deps.sh -else - .travis/build-deps.sh > build-deps.log 2>&1 || (cat build-deps.log && exit 1) -fi
Signature · 1 line
2.25.1
sorry, I sent it twice.
the last one is good, please ignore previous "v2"
I've managed to resolve "travis_wait" issue. it was non trivial output redirection issue.
the rest is just fine.
patch itself is important it re-enables cmocka tests in travis (they are not running now, after cmocka git submodule was removed)
вс, 22 мар. 2020 г. в 17:35, <[email protected]...>:
Quoted 295 lines
From: Ilya Shipitsin <[email protected]...>
as described on https://docs.travis-ci.com/user/multi-cpu-architectures
travis-ci
now supports amd64, ppcle, arm64, s390 architectures. Add arm64 and s390x.travis-ci images were upgraded to bionic.
"sudo" is deprecated, let us remove it, also "matrix" is deprecated in favour of "jobs".
LD_LIBRARY_PATHwas replaced by using "rpath" in LDFLAGS, which is more elegant way of linking.also, dependencies were upgraded to the latest versions.
travis_waitwas added for long openssl builds.cmocka was added to linux and osx builds.
---
v3 resolvedtravis_waitoutput redirection issue, now it works as expected. I had to specify "names" for jobs,
without names travis puts secure variable as job namev2 rebased against proper commit
.travis.yml | 87 +++++++++++++++++++++++++-------------- .travis/build-check.sh | 10 +---- .travis/build-deps.sh | 10 +++-- .travis/run-build-deps.sh | 10 ----- 4 files changed, 62 insertions(+), 55 deletions(-) delete mode 100755 .travis/run-build-deps.sh.travis.yml +4
-5@@ -1,5 +1,4 @@ -sudo: required -dist: xenial +dist: bionic os: linux@@ -11,86 +10,111 @@ env: - PREFIX="${HOME}/opt" - TAP_WINDOWS_VERSION=9.23.3 - LZO_VERSION=2.10 - - PKCS11_HELPER_VERSION=1.25.1 - - MBEDTLS_VERSION=2.16.1 + - PKCS11_HELPER_VERSION=1.26 + - MBEDTLS_VERSION=2.16.4 - MBEDTLS_CFLAGS="-I${PREFIX}/include" - MBEDTLS_LIBS="-L${PREFIX}/lib -lmbedtls -lmbedx509 -lmbedcrypto" - - OPENSSL_VERSION=1.0.2s + - OPENSSL_VERSION=1.0.2u - OPENSSL_CFLAGS="-I${PREFIX}/include" - OPENSSL_LIBS="-L${PREFIX}/lib -lssl -lcrypto" # The next declaration is the encrypted COVERITY_SCAN_TOKEN, created # via the "travis encrypt" command using the project repo's publickey
- secure:
"l9mSnEW4LJqjxftH5i1NdDaYfGmQB1mPXnSB3DXnsjzkCWZ+yJLfBemfQ0tx/wS7chBYxqUaUIMT0hw4zJVp/LANFJo2vfh//ymTS6h0uApRY1ofg9Pp1BFcV1laG6/u8pwSZ2EBy/GhCd3DS436oE8sYBRaFM9FU62L/oeQBfJ7r4ID/0eB1b8bqlbD4paty9MHui2P8EZJwR+KAD84prtfpZOcrSMxPh9OUhJxzxUvvVoP4s4+lZ5Kgg1bBQ3yzKGDqe8VOgK2BWCEuezqhMMc8oeKmAe7CUkoz5gsGYH++k3I9XzP9Z4xeJKoQnC/82qi4xkJmlaOxdionej9bHIcjfRt7D8j1J0U+wOj4p8VrDy7yHaxuN2fi0K5MGa/CaXQSrkna8dePniCng+xQ2MY/zxuRX2gA6xPNLUyQLU9LqIug7wj4z84Hk9iWib4L20MoPjeEo+vAUNq8FtjOPxMuHNpv4iGGx6kgJm7RXl5vC5hxfK6MprrnYe2U5Mcd8jpzagKBaKHL3zV2FxX9k0jRO9Mccz7M2WnaV0MQ6zcngzTN4+s0kCjhfGKd2F2ANT2Gkhj3Me36eNHfuE0dBbvYCMh4b3Mgd7b/OuXwQWdJ8PjJ1WHXjSOw5sHw1suaV6cEO2Meyz5j1tOkyOi0M9QF+LFenQ9vLH4sBCww8U=".travis.yml +38
-15-matrix: +jobs: include: - - env: + - name: cl + env: - SSLLIB="openssl" - OPENSSL_VERSION="1.1.1d" - P7Z="c:\Program Files\7-Zip\7z.exe" - CC="cl" os: windows compiler: cl - - env: SSLLIB="openssl" RUN_COVERITY="1" + - name: Coverity scan + env: SSLLIB="openssl" RUN_COVERITY="1" os: linux compiler: gcc - - env: SSLLIB="openssl" OPENSSL_VERSION="1.0.1u" + - name: gcc | openssl-1.0.1u + env: SSLLIB="openssl" OPENSSL_VERSION="1.0.1u" os: linux compiler: gcc - - env: SSLLIB="openssl" OPENSSL_VERSION="1.1.1c" + - name: gcc | openssl-1.1.1d + env: SSLLIB="openssl" OPENSSL_VERSION="1.1.1d" os: linux + arch: amd64 compiler: gcc - - env: SSLLIB="openssl" OPENSSL_VERSION="1.1.1c" LABEL="linux-ppc64le" - os: linux-ppc64le + - name: gcc | openssl-1.1.1d + env: SSLLIB="openssl" OPENSSL_VERSION="1.1.1d" + os: linux + arch: ppc64le + compiler: gcc + - name: gcc | openssl-1.1.1d + env: SSLLIB="openssl" OPENSSL_VERSION="1.1.1d" + os: linux + arch: arm64 + compiler: gcc + - name: gcc | openssl-1.1.1d + env: SSLLIB="openssl" OPENSSL_VERSION="1.1.1d" + os: linux + arch: s390x compiler: gcc - - env: SSLLIB="openssl" EXTRA_CONFIG="--enable-iproute2" + - name: gcc | openssl-1.0.2u | iproute2 + env: SSLLIB="openssl" EXTRA_CONFIG="--enable-iproute2" os: linux compiler: gcc - - env: SSLLIB="openssl" CFLAGS="-fsanitize=address" CC=clang-9 + - name: clang+asan | openssl-1.0.2u + env: SSLLIB="openssl" CFLAGS="-fsanitize=address" CC=clang-9 os: linux compiler: clang - - env: SSLLIB="openssl" OPENSSL_VERSION="1.1.1c" CC=clang-9 + - name: clang | openssl-1.1.1d + env: SSLLIB="openssl" OPENSSL_VERSION="1.1.1d" CC=clang-9 os: linux compiler: clang - - env: SSLLIB="mbedtls" + - name: gcc | mbedtls + env: SSLLIB="mbedtls" os: linux compiler: gcc - - env: SSLLIB="mbedtls" CFLAGS="-fsanitize=address" CC=clang-9 + - name: clang+asan | mbedtls + env: SSLLIB="mbedtls" CFLAGS="-fsanitize=address" CC=clang-9 os: linux compiler: clang - - env: SSLLIB="openssl" + - name: clang | openssl-1.0.2u + env: SSLLIB="openssl" os: osx compiler: clang - - env: SSLLIB="mbedtls" + - name: clang | mbedtls + env: SSLLIB="mbedtls" os: osx compiler: clang - - env: SSLLIB="openssl" CHOST=x86_64-w64-mingw32OPENSSL_VERSION="1.0.1u"
.travis.yml +2
-0+ - name: mingw64 | openssl-1.0.1u + env: SSLLIB="openssl" CHOST=x86_64-w64-mingw32OPENSSL_VERSION="1.0.1u"
os: linux
compiler: ": Win64 build only"
- - env: SSLLIB="openssl" CHOST=x86_64-w64-mingw32
OPENSSL_VERSION="1.1.1c".travis.yml +2
-0+ - name: mingw64 | openssl-1.1.1d + env: SSLLIB="openssl" CHOST=x86_64-w64-mingw32OPENSSL_VERSION="1.1.1d"
os: linux
compiler: ": Win64 build only".travis.yml +2
-2- - env: SSLLIB="openssl" CHOST=i686-w64-mingw32 + - name: mingw32 | openssl-1.0.2u + env: SSLLIB="openssl" CHOST=i686-w64-mingw32 os: linux compiler: ": Win32 build only" - - env: SSLLIB="openssl" EXTRA_CONFIG="--disable-lzo"EXTRA_SCRIPT="make distcheck" CC=clang-9
.travis.yml +2
-0+ - name: clang | openssl-1.0.2u | disable-lzo | distcheck + env: SSLLIB="openssl" EXTRA_CONFIG="--disable-lzo"EXTRA_SCRIPT="make distcheck" CC=clang-9
os: linux
compiler: clang.travis.yml +2
-4- - env: SSLLIB="openssl" EXTRA_CONFIG="--enable-small" CC=clang-9 + - name: clang | openssl-1.0.2u | enable-small + env: SSLLIB="openssl" EXTRA_CONFIG="--enable-small" CC=clang-9 os: linux compiler: clang addons: apt: - sources: - - ubuntu-toolchain-r-test - - sourceline: 'deb https://apt.llvm.org/xenial/llvm-toolchain-xenial-9 main'
.travis.yml +0
-2- key_url: 'https://apt.llvm.org/llvm-snapshot.gpg.key' update: true - packages: [ liblzo2-dev, libpam0g-dev, liblz4-dev, linux-libc-dev,man2html, mingw-w64 ]
+ packages: [ liblzo2-dev, libpam0g-dev, liblz4-dev, linux-libc-dev,
man2html, mingw-w64, clang-9, libcmocka-dev ]
homebrew:
update: true.travis.yml +1
-2- packages: [ lzo ] + packages: [ lzo, lz4, cmocka ] cache: directories:@@ -99,9 +123,8 @@ cache: - ${HOME}/Library/Caches/Homebrew install: - - if [ "$TRAVIS_OS_NAME" = "linux" ] && [ "$TRAVIS_CPU_ARCH" !="ppc64le" ]; then sudo apt-get install clang-9; fi
- if [ ! -z "${CHOST}" ]; then unset CC; fi.travis.yml +1
-1- - .travis/run-build-deps.sh + - travis_wait 30 bash -c '.travis/build-deps.sh > build-deps.log 2>&1'|| (cat build-deps.log && exit 1)
before_script:
-.travis/coverity.sh.travis/build-check.sh +1
-9@@ -6,14 +6,6 @@ if [ "${TRAVIS_OS_NAME}" = "windows" ]; then MSBuild.exe openvpn.sln //p:Platform=x64 && exit 0 fi -if [ "${TRAVIS_OS_NAME}" = "linux" ]; then - export LD_LIBRARY_PATH="${PREFIX}/lib:${LD_LIBRARY_PATH:-}" -fi - -if [ "${TRAVIS_OS_NAME}" = "osx" ]; then - export DYLD_LIBRARY_PATH="${PREFIX}/lib:${DYLD_LIBRARY_PATH:-}" -fi - autoreconf -vi if [ -z ${CHOST+x} ]; then@@ -21,7 +13,7 @@ if [ -z ${CHOST+x} ]; then export EXTRA_CONFIG="${EXTRA_CONFIG:-} --enable-werror" fi ./configure --with-crypto-library="${SSLLIB}" ${EXTRA_CONFIG:-} || (cat config.log && exit 1) - make -j$JOBS + make LDFLAGS="-Wl,-rpath,${PREFIX}/lib" -j$JOBS src/openvpn/openvpn --version || true if [ "${TRAVIS_OS_NAME}" = "linux" ]; thenldd src/openvpn/openvpn;.travis/build-deps.sh +1
-2@@ -44,17 +44,19 @@ build_lzo () { } download_pkcs11_helper () { - if [ ! -f "pkcs11-helper-${PKCS11_HELPER_VERSION}.tar.bz2" ]; then + if [ ! -f "pkcs11-helper-${PKCS11_HELPER_VERSION}.tar.gz" ]; then wget -P download-cache/ \ - "https://github.com/OpenSC/pkcs11-helper/releases/download/pkcs11-helper-${PKCS11_HELPER_VERSION}/pkcs11-helper-${PKCS11_HELPER_VERSION}.tar.bz2
"
+ "
https://github.com/OpenSC/pkcs11-helper/archive/pkcs11-helper-${PKCS11_HELPER_VERSION}.tar.gz
"
fi
}build_pkcs11_helper () { if [ "$(cat ${PREFIX}/.pkcs11_helper-version)" !="${PKCS11_HELPER_VERSION}" ]; then
- tar jxf
download-cache/pkcs11-helper-${PKCS11_HELPER_VERSION}.tar.bz2
+ tar xf
download-cache/pkcs11-helper-${PKCS11_HELPER_VERSION}.tar.gz(.travis/build-deps.sh +3
-2- cd "pkcs11-helper-${PKCS11_HELPER_VERSION}" + cd "pkcs11-helper-pkcs11-helper-${PKCS11_HELPER_VERSION}" + + autoreconf -iv ./configure --host=${CHOST} --program-prefix='' --libdir=${PREFIX}/lib \ --prefix=${PREFIX} --build=x86_64-pc-linux-gnu \.travis/run-build-deps.sh deleted +0
-9@@ -1,10 +0,0 @@ -#!/bin/sh -set -eux - -if [ "${TRAVIS_OS_NAME}" = "windows" ]; then - # for windows we need to print output since openssl build - # might take more than 10 minutes, which causes build abort - .travis/build-deps.sh -else - .travis/build-deps.sh > build-deps.log 2>&1 || (cat build-deps.log &&exit 1)
-fi
--
2.25.1
Hi,
Tested with my openvpn github fork - all jobs passed and overall travis dashboard looks nice thanks to added "name" field.
It would be even nicer to have "arch" as part of name, because now it looks like
gcc | openssl-1.1.1d
gcc | openssl-1.1.1dBut this is already step forward and improvements could be done in a separate patch.
Hello,
without "name" it looks like
https://travis-ci.org/github/chipitsine/openvpn/builds/665421561
brrr
arch is displayed (when you logged in to travis :)
[image: Screenshot from 2020-03-24 13-52-10.png]
вт, 24 мар. 2020 г. в 13:48, Lev Stipakov <[email protected]...>:
Quoted 16 lines
Hi,
Tested with my openvpn github fork - all jobs passed and overall travis dashboard looks nice thanks to added "name" field.
It would be even nicer to have "arch" as part of name, because now it looks like
gcc | openssl-1.1.1d gcc | openssl-1.1.1dBut this is already step forward and improvements could be done in a separate patch.
Acked-by Lev Stipakov <[email protected]...>
Yes, I agree that with name is looks much better.
I wonder why displaying arch requires you to be logged in.
I guess nobody yet reported that issue.
Maybe, I'll report.
вт, 24 мар. 2020 г. в 14:03, Lev Stipakov <[email protected]...>:
Quoted 4 lines
Yes, I agree that with name is looks much better.
I wonder why displaying arch requires you to be logged in.
Thanks.
Your patch has been applied to the master branch.
commit 072f7d352d4c9b9b58dfac97fc4bb5c95652aa25
Author: Ilya Shipitsin Date: Sun Mar 22 17:35:21 2020 +0500
travis-ci: add arm64, s390x builds.
Acked-by: Lev Stipakov <[email protected]...>
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg19574.html
Signed-off-by: Gert Doering <[email protected]...>--
kind regards,
Gert Doering
sometimes, arm64 build fails
if that will become often, we will mark it as "allowed failures"
thanks to everyone, we have cmocka tests back!
вт, 24 мар. 2020 г. в 14:04, Илья Шипицин <[email protected]...>:
Quoted 11 lines
I guess nobody yet reported that issue.
Maybe, I'll report.
вт, 24 мар. 2020 г. в 14:03, Lev Stipakov <[email protected]...>:
Quoted 4 lines
Yes, I agree that with name is looks much better.
I wonder why displaying arch requires you to be logged in.