X-Git-Url: http://wagner.pp.ru/gitweb/?a=blobdiff_plain;f=.travis.yml;h=93d56c14b6d4bf21063e638d102fae82744882bd;hb=c2696f14ed9d5ac2cd098461cf371ba0f037d0f7;hp=5f34fb2d2860d6ff4d2266bba1057eb89db9eda0;hpb=a11dd16be96d734291be6d3a6b8dfbddf8c48ec1;p=openssl-gost%2Fengine.git

diff --git a/.travis.yml b/.travis.yml
index 5f34fb2..93d56c1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,50 +9,60 @@ env:
     - PREFIX=${HOME}/opt
     - PATH=${PREFIX}/bin:${PATH}
     - OPENSSL_BRANCH=master
+    # known good commit
+    - OPENSSL_COMMIT=edbb56ee4fafc07eb77747ad25278a04b89adc09
+    - RPATH="-Wl,-rpath=${PREFIX}/lib"
 
 matrix:
   include:
-    - name: linux/gcc/x86_64/openssl-master
-      os: linux
-      compiler: gcc
-    - name: linux/gcc/x86_64/openssl-1.1.1
-      os: linux
-      compiler: gcc
-      env: OPENSSL_BRANCH=OpenSSL_1_1_1-stable
-      if: type != cron
-    - name: linux/gcc/ppc64le/openssl-master
-      os: linux
-      arch: ppc64le
-      compiler: gcc
-    - name: linux/gcc+ASan/x86_64/openssl-master
+    - name: gcc | openssl-hope-for-best
+    - name: clang | openssl-hope-for-best
+      compiler: clang
+    - name: gcc | openssl-master
+      env: OPENSSL_BRANCH=master
+      env: OPENSSL_COMMIT=HEAD
+    # Dynamic and static analysers
+    - name: gcc+ASan | openssl-hope-for-best
       env: ASAN=-DASAN=1
-      os: linux
-      compiler: gcc
-    - name: linux/gcc+Coverity/x86_64 (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
-      os: linux
-      compiler: gcc
       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/openssl-master
-      os: linux
+    # Other arches
+    - name: gcc | openssl-hope-for-best
+      env: CFLAGS=-m32 LDFLAGS=-m32 SETARCH="setarch i386" APT_INSTALL=gcc-multilib
+    - name: gcc | openssl-hope-for-best
+      arch: ppc64le
+    - name: gcc | openssl-hope-for-best
       arch: arm64
-      compiler: gcc
-    - name: osx/clang/x86_64/openssl-master
+    - name: gcc | openssl-hope-for-best
+      arch: s390x
+    # Non-linux
+    - 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
 
 before_script:
   - curl -L https://cpanmin.us | sudo perl - --sudo App::cpanminus
   - 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
+  - if [ "$APT_INSTALL" ]; then sudo apt-get install -y $APT_INSTALL; fi
+  #- git clone --depth 1 -b ${OPENSSL_BRANCH} https://github.com/openssl/openssl.git
+  - git clone --single-branch -b ${OPENSSL_BRANCH} https://github.com/openssl/openssl.git
   - cd openssl
+  - git reset --hard ${OPENSSL_COMMIT}
   - git describe --always --long
-  - ./config shared -d --prefix=${PREFIX} --openssldir=${PREFIX} -Wl,-rpath=${PREFIX}/lib && travis_wait make -s -j$(nproc) all && make -s install_sw
+  - $SETARCH ./config shared -d --prefix=${PREFIX} --openssldir=${PREFIX} ${RPATH}
+  - travis_wait $SETARCH make -s -j$(nproc) build_libs
+  - travis_wait $SETARCH make -s -j$(nproc) build_programs
+  - make -s install_sw
   - cd ..
 
 script: