From 56ef16bb6303e719a6403cb2784907436e51fa43 Mon Sep 17 00:00:00 2001 From: Dmitry Belyavskiy Date: Thu, 7 May 2020 22:50:39 +0300 Subject: [PATCH] It does not work this way --- .travis.yml | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index b526b86..57b8ba7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,21 +8,22 @@ env: global: - PREFIX=${HOME}/opt - PATH=${PREFIX}/bin:${PATH} - #- OPENSSL_BRANCH=openssl-3.0.0-alpha1 - - OPENSSL_BRANCH=edbb56ee4fafc07eb77747ad25278a04b89adc09 + - OPENSSL_BRANCH=master + # known good commit + #- OPENSSL_BRANCH=edbb56ee4fafc07eb77747ad25278a04b89adc09 - RPATH="-Wl,-rpath=${PREFIX}/lib" matrix: include: - - name: gcc | openssl-known-good - - name: clang | openssl-known-good + - name: gcc | openssl-hope-for-best + - name: clang | openssl-hope-for-best compiler: clang - name: gcc | openssl-master env: OPENSSL_BRANCH=master # Dynamic and static analysers - - name: gcc+ASan | openssl-known-good + - name: gcc+ASan | openssl-hope-for-best env: ASAN=-DASAN=1 - - name: gcc+Coverity | openssl-known-good (cron) + - name: gcc+Coverity | openssl-hope-for-best (cron) env: COVERITY_SCAN_PROJECT_NAME="gost-engine" COVERITY_SCAN_BRANCH_PATTERN="*" COVERITY_SCAN_NOTIFICATION_EMAIL="beldmit@gmail.com" COVERITY_SCAN_BUILD_COMMAND="make" if: type == cron script: @@ -31,16 +32,16 @@ matrix: - cmake -DOPENSSL_ROOT_DIR=${PREFIX} -DOPENSSL_LIBRARIES=${PREFIX}/lib -DOPENSSL_ENGINES_DIR=${PREFIX}/engines .. - curl -s "https://scan.coverity.com/scripts/travisci_build_coverity_scan.sh" | bash || true # Other arches - - name: gcc | openssl-known-good + - name: gcc | openssl-hope-for-best env: CFLAGS=-m32 LDFLAGS=-m32 SETARCH="setarch i386" APT_INSTALL=gcc-multilib - - name: gcc | openssl-known-good + - name: gcc | openssl-hope-for-best arch: ppc64le - - name: gcc | openssl-known-good + - name: gcc | openssl-hope-for-best arch: arm64 - - name: gcc | openssl-known-good + - name: gcc | openssl-hope-for-best arch: s390x # Non-linux - - name: clang | openssl-known-good + - name: clang | openssl-hope-for-best os: osx compiler: clang env: RPATH="-Wl,-rpath,${PREFIX}/lib" -- 2.39.5