X-Git-Url: http://wagner.pp.ru/gitweb/?a=blobdiff_plain;f=.travis.yml;h=57b8ba76578a2ba3b29a7725c6f1c75ccaf878bd;hb=56ef16bb6303e719a6403cb2784907436e51fa43;hp=372ec69a6ac4b40da36ae59c9f2ad518491bbc3a;hpb=ef1011dcdc645e653bad548ca06d671eed572e89;p=openssl-gost%2Fengine.git

diff --git a/.travis.yml b/.travis.yml
index 372ec69..57b8ba7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,20 +8,22 @@ env:
   global:
     - PREFIX=${HOME}/opt
     - PATH=${PREFIX}/bin:${PATH}
-    - OPENSSL_BRANCH=openssl-3.0.0-alpha1
+    - OPENSSL_BRANCH=master
+    # known good commit
+    #- OPENSSL_BRANCH=edbb56ee4fafc07eb77747ad25278a04b89adc09
     - RPATH="-Wl,-rpath=${PREFIX}/lib"
 
 matrix:
   include:
-    - name: gcc | openssl-stable
-    - name: clang | openssl-stable
+    - 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-stable
+    - name: gcc+ASan | openssl-hope-for-best
       env: ASAN=-DASAN=1
-    - name: gcc+Coverity | openssl-stable (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:
@@ -30,22 +32,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-stable
+    - name: gcc | openssl-hope-for-best
       env: CFLAGS=-m32 LDFLAGS=-m32 SETARCH="setarch i386" APT_INSTALL=gcc-multilib
-    - name: gcc | openssl-stable
+    - name: gcc | openssl-hope-for-best
       arch: ppc64le
-    - name: gcc | openssl-stable
+    - name: gcc | openssl-hope-for-best
       arch: arm64
-    - name: gcc | openssl-stable
+    - name: gcc | openssl-hope-for-best
       arch: s390x
     # Non-linux
-    - name: clang | openssl-stable
+    - name: clang | openssl-hope-for-best
       os: osx
       compiler: clang
       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