X-Git-Url: http://wagner.pp.ru/gitweb/?a=blobdiff_plain;f=.travis.yml;h=f1f19c3ed3b744366582d4aa9c92d99ca9d188af;hb=062e004e48a9087de55e598afc4a78f72e7f4248;hp=412d20a3c395f9cbc74114f9b92af604e026cc85;hpb=58710773611a1ed466cc9a5078e2c0ab52259ae0;p=openssl-gost%2Fengine.git

diff --git a/.travis.yml b/.travis.yml
index 412d20a..f1f19c3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,12 +5,6 @@ os: linux
 
 language: c
 
-addons:
-  apt:
-    packages: [ cpanminus ]
-  homebrew:
-    packages: [ cpanminus ]
-
 env:
   global:
     - PREFIX=${HOME}/opt
@@ -19,18 +13,19 @@ env:
 
 matrix:
   include:
-    - os: linux
+    - name: linux/gcc/x86_64
+      os: linux
       compiler: gcc
-    - env: LABEL="linux-ppc64le" CMAKE_VERSION=3.15.1
-      os: linux-ppc64le
+    - name: linux/gcc/ppc64le
+      os: linux
+      arch: ppc64le
       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+ASan/x86_64
+      env: ASAN=-DASAN=1
       os: linux
       compiler: gcc
-    - env: COVERITY_SCAN_PROJECT_NAME="gost-engine" COVERITY_SCAN_BRANCH_PATTERN="*" COVERITY_SCAN_NOTIFICATION_EMAIL="beldmit@gmail.com" COVERITY_SCAN_BUILD_COMMAND="make"
+    - 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
@@ -39,10 +34,12 @@ matrix:
         - 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
-    - os: linux
+    - name: linux/gcc/arm64
+      os: linux
       arch: arm64
       compiler: gcc
-    - os: osx
+    - name: osx/clang/x86_64
+      os: osx
       compiler: clang
 
 before_script:
@@ -50,7 +47,7 @@ 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} && travis_wait make -s -j$(nproc) all && make -s install_sw
   - cd ..
 
 script: