X-Git-Url: http://wagner.pp.ru/gitweb/?a=blobdiff_plain;f=.travis.yml;h=372d045a312e2c154963da4d6619700e3dc18525;hb=e860e2819526d188cafcfa64dbbe52595c5ac167;hp=30ad2f370d801295bdd20885a918d5e09fb7134d;hpb=36af4d82eb967367885dfa217f50a6941f5c9c40;p=openssl-gost%2Fengine.git

diff --git a/.travis.yml b/.travis.yml
index 30ad2f3..372d045 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,16 +1,9 @@
-sudo: required
-dist: xenial
+dist: bionic
 
 os: linux
 
 language: c
 
-addons:
-  apt:
-    packages: [ cpanminus ]
-  homebrew:
-    packages: [ cpanminus ]
-
 env:
   global:
     - PREFIX=${HOME}/opt
@@ -19,21 +12,38 @@ env:
 
 matrix:
   include:
-    - os: linux
+    - name: linux/gcc/x86_64
+      os: linux
+      compiler: gcc
+    - name: linux/gcc/x86_64
+      os: linux
       compiler: gcc
-    - env: LABEL="linux-ppc64le" CMAKE_VERSION=3.15.1
-      os: linux-ppc64le
+      env: OPENSSL_BRANCH=OpenSSL_1_1_1-stable
+      if: type != cron
+    - name: linux/gcc/ppc64le
+      os: linux
+      arch: ppc64le
+      compiler: gcc
+    - name: linux/gcc+ASan/x86_64
+      env: ASAN=-DASAN=1
+      os: linux
       compiler: gcc
-      install:
-        - wget https://cmake.org/files/v${CMAKE_VERSION%.*}/cmake-${CMAKE_VERSION}.tar.gz && tar -xzf cmake-${CMAKE_VERSION}.tar.gz
-        - cd cmake-${CMAKE_VERSION} && ./bootstrap && sudo make install && cd ..
-    - env: ASAN=-DASAN=1
+    - name: linux/gcc+Coverity/x86_64 (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
       os: linux
       compiler: gcc
-    - env: RUN_COVERITY=1 COVERITY_SCAN_PROJECT_NAME="gost-engine" COVERITY_SCAN_BRANCH_PATTERN="*" COVERITY_SCAN_NOTIFICATION_EMAIL="beldmit@gmail.com" COVERITY_SCAN_BUILD_COMMAND="make"
+      script:
+        - mkdir build
+        - cd build
+        - 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
+    - name: linux/gcc/arm64
       os: linux
+      arch: arm64
       compiler: gcc
-    - os: osx
+    - name: osx/clang/x86_64
+      os: osx
       compiler: clang
 
 before_script:
@@ -41,14 +51,13 @@ before_script:
   - sudo cpanm --notest Test2::V0 > build.log 2>&1 || (cat build.log && exit 1)
   - git clone --depth 1 -b ${OPENSSL_BRANCH} https://github.com/openssl/openssl.git
   - cd openssl
-  - ./config shared -d --prefix=${PREFIX} --openssldir=${PREFIX} && make -j$(nproc) all && make install_sw > build.log 2>&1 || (cat build.log && exit 1)
+  - ./config shared -d --prefix=${PREFIX} --openssldir=${PREFIX} -Wl,-rpath=${PREFIX}/lib && travis_wait make -s -j$(nproc) all && make -s install_sw
   - cd ..
 
 script:
-  - 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
   - mkdir build
   - cd build
   - cmake -DOPENSSL_ROOT_DIR=${PREFIX} -DOPENSSL_LIBRARIES=${PREFIX}/lib -DOPENSSL_ENGINES_DIR=${PREFIX}/engines ${ASAN} ..
-  - if [ ! -z ${COVERITY_SCAN_TOKEN+x} -a "${RUN_COVERITY}" = "1" ]; then curl -s "https://scan.coverity.com/scripts/travisci_build_coverity_scan.sh" | bash || true; else make; fi
+  - make
   - make test CTEST_OUTPUT_ON_FAILURE=1
+  - if [ -z "$ASAN" ]; then make tcl_tests; fi