X-Git-Url: http://wagner.pp.ru/gitweb/?a=blobdiff_plain;f=.travis.yml;h=afe342281d1a3a5301ade84180e917c1429eadbc;hb=0321ed4fa2544e18001d8c50f852e676864aa980;hp=b526b86d31e8f345e3621fb3cb9f715d714ec403;hpb=c187b772bfacd482bc8bb3b23119f9ae06046534;p=openssl-gost%2Fengine.git

diff --git a/.travis.yml b/.travis.yml
index b526b86..afe3422 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,21 +8,20 @@ env:
   global:
     - PREFIX=${HOME}/opt
     - PATH=${PREFIX}/bin:${PATH}
-    #- OPENSSL_BRANCH=openssl-3.0.0-alpha1
-    - OPENSSL_BRANCH=edbb56ee4fafc07eb77747ad25278a04b89adc09
+    - OPENSSL_BRANCH=openssl-3.0.0-alpha8
     - RPATH="-Wl,-rpath=${PREFIX}/lib"
 
 matrix:
   include:
-    - name: gcc | openssl-known-good
-    - name: clang | openssl-known-good
+    - name: gcc | openssl-stable
+    - name: clang | openssl-stable
       compiler: clang
     - name: gcc | openssl-master
       env: OPENSSL_BRANCH=master
     # Dynamic and static analysers
-    - name: gcc+ASan | openssl-known-good
+    - name: gcc+ASan | openssl-stable
       env: ASAN=-DASAN=1
-    - name: gcc+Coverity | openssl-known-good (cron)
+    - name: gcc+Coverity | openssl-stable (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,22 +30,22 @@ 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-stable
       env: CFLAGS=-m32 LDFLAGS=-m32 SETARCH="setarch i386" APT_INSTALL=gcc-multilib
-    - name: gcc | openssl-known-good
+    - name: gcc | openssl-stable
       arch: ppc64le
-    - name: gcc | openssl-known-good
+    - name: gcc | openssl-stable
       arch: arm64
-    - name: gcc | openssl-known-good
+    - name: gcc | openssl-stable
       arch: s390x
     # Non-linux
-    - name: clang | openssl-known-good
+    - name: clang | openssl-stable
       os: osx
       compiler: clang
-      env: RPATH="-Wl,-rpath,${PREFIX}/lib"
+      #env: RPATH="-Wl,-rpath,${PREFIX}/lib"
   allow_failures:
       env: OPENSSL_BRANCH=master
-    #  if: type == pull_request
+      if: type == pull_request
 
 before_script:
   - curl -L https://cpanmin.us | sudo perl - --sudo App::cpanminus
@@ -62,6 +61,7 @@ before_script:
   - cd ..
 
 script:
+  - set -e
   - mkdir build
   - cd build
   - cmake -DOPENSSL_ROOT_DIR=${PREFIX} -DOPENSSL_LIBRARIES=${PREFIX}/lib -DOPENSSL_ENGINES_DIR=${PREFIX}/engines ${ASAN} ..