From: Dmitry Belyavskiy Date: Mon, 4 May 2020 13:16:35 +0000 (+0300) Subject: Merge branch 'master' of https://github.com/gost-engine/engine X-Git-Tag: v3.0.0~168 X-Git-Url: http://wagner.pp.ru/gitweb/?a=commitdiff_plain;h=0402564c47b0143e1a469088b7f822cf01d60da4;hp=c863b003bde4deffc8cba445c3e449c31bb2355a;p=openssl-gost%2Fengine.git Merge branch 'master' of https://github.com/gost-engine/engine --- diff --git a/.travis.yml b/.travis.yml index 4929300..6867e2b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,6 +9,7 @@ env: - PREFIX=${HOME}/opt - PATH=${PREFIX}/bin:${PATH} - OPENSSL_BRANCH=OpenSSL_1_1_1-stable + - OPENSSL_TAG=openssl-3.0.0-alpha1 - RPATH="-Wl,-rpath=${PREFIX}/lib" matrix: @@ -51,8 +52,9 @@ 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 + - git clone https://github.com/openssl/openssl.git - cd openssl + - git checkout ${OPENSSL_TAG} - git describe --always --long - $SETARCH ./config shared -d --prefix=${PREFIX} --openssldir=${PREFIX} ${RPATH} - travis_wait $SETARCH make -s -j$(nproc) build_libs