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

diff --git a/.travis.yml b/.travis.yml
index f1f19c3..b05efa6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,3 @@
-sudo: required
 dist: bionic
 
 os: linux
@@ -13,14 +12,19 @@ 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/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,11 +38,11 @@ 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: osx/clang/x86_64/openssl-master
       os: osx
       compiler: clang
 
@@ -47,16 +51,13 @@ 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} && travis_wait make -s -j$(nproc) all && make -s install_sw
+  - ./config shared -d --prefix=${PREFIX} --openssldir=${PREFIX} -Wl,-rpath=${PREFIX}/lib && travis_wait make -s -j$(nproc) all && make -s install_sw
   - cd ..
 
 script:
-  - if [ "${TRAVIS_OS_NAME}" = "linux" ]; then export LD_LIBRARY_PATH="${PREFIX}/lib:${LD_LIBRARY_PATH:-}"; fi
-  - if [ "${TRAVIS_OS_NAME}" = "osx" ]; then export DYLD_LIBRARY_PATH="${PREFIX}/lib:${DYLD_LIBRARY_PATH:-}"; fi
   - mkdir build
   - cd build
   - cmake -DOPENSSL_ROOT_DIR=${PREFIX} -DOPENSSL_LIBRARIES=${PREFIX}/lib -DOPENSSL_ENGINES_DIR=${PREFIX}/engines ${ASAN} ..
   - make
   - make test CTEST_OUTPUT_ON_FAILURE=1
   - if [ -z "$ASAN" ]; then make tcl_tests; fi
-