X-Git-Url: http://wagner.pp.ru/gitweb/?a=blobdiff_plain;f=.travis.yml;h=e3eb43caa77de8a3c3550f89e60d6f5fe277cf7e;hb=c0eadfee19963e68a96f8a7720d39d262a34005d;hp=d617ecec89a7734b4ea45ee267097ddbb73596b3;hpb=09615031fffa93d7b42af7ad1029d963445c7c74;p=openssl-gost%2Fengine.git

diff --git a/.travis.yml b/.travis.yml
index d617ece..e3eb43c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,3 @@
-sudo: required
 dist: bionic
 
 os: linux
@@ -13,14 +12,26 @@ env:
 
 matrix:
   include:
-    - name: linux/gcc/x86_64
+    - name: linux/gcc/x86_64/openssl-master
       os: linux
       compiler: gcc
-    - name: linux/gcc/ppc64le
+    - name: linux/clang/x86_64/openssl-master
+      os: linux
+      compiler: clang
+    - name: linux/gcc/i386/openssl-master
+      os: linux
+      compiler: gcc
+      env: CFLAGS=-m32 LDFLAGS=-m32 SETARCH="setarch i386" APT_INSTALL=gcc-multilib
+    - 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
+    - name: linux/gcc+ASan/x86_64/openssl-master
       env: ASAN=-DASAN=1
       os: linux
       compiler: gcc
@@ -34,20 +45,29 @@ 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
-    - name: linux/gcc/arm64
+    - name: linux/gcc/arm64/openssl-master
       os: linux
       arch: arm64
       compiler: gcc
-    - name: osx/clang/x86_64
+    - name: linux/gcc/s390x/openssl-master
+      os: linux
+      arch: s390x
+      compiler: gcc
+    - name: osx/clang/x86_64/openssl-master
       os: osx
       compiler: clang
 
 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)
+  - 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
   - cd openssl
-  - ./config shared -d --prefix=${PREFIX} --openssldir=${PREFIX} -Wl,-rpath=${PREFIX}/lib && travis_wait make -s -j$(nproc) all && make -s install_sw
+  - git describe --always --long
+  - $SETARCH ./config shared -d --prefix=${PREFIX} --openssldir=${PREFIX} -Wl,-rpath=${PREFIX}/lib
+  - travis_wait $SETARCH make -s -j$(nproc) build_libs
+  - travis_wait $SETARCH make -s -j$(nproc) build_programs
+  - make -s install_sw
   - cd ..
 
 script: