From: Ilya Shipitsin <chipitsine@gmail.com>
Date: Thu, 28 Jun 2018 08:29:53 +0000 (+0500)
Subject: move .ci scripts into .travis.yml
X-Git-Tag: v3.0.0~417^2^2
X-Git-Url: http://www.wagner.pp.ru/gitweb/?a=commitdiff_plain;h=0f4c57408321d40b7c812969997fc923e138414b;p=openssl-gost%2Fengine.git

move .ci scripts into .travis.yml
---

diff --git a/.ci/build-check.sh b/.ci/build-check.sh
deleted file mode 100755
index 3e843f6..0000000
--- a/.ci/build-check.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-set -eux
-
-cmake -DOPENSSL_ROOT_DIR=${PREFIX} -DOPENSSL_LIBRARIES=${PREFIX}/lib
-make
-
-cp ./bin/gost.so ${PREFIX}/lib/engines-1.1
-
-export LD_LIBRARY_PATH=${PREFIX}/lib
-export PATH=${PREFIX}/bin:${PATH}
-export OPENSSL_ENGINES=${PREFIX}/lib/engines-1.1
-
-prove -v test/{00-engine.t,01-digest.t,02-mac.t,03-encrypt.t}
-
diff --git a/.ci/build-openssl.sh b/.ci/build-openssl.sh
deleted file mode 100755
index 4c85b94..0000000
--- a/.ci/build-openssl.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-set -eux
-
-git clone -b ${OPENSSL_BRANCH} https://github.com/openssl/openssl.git
-
-cd openssl
-./config shared --prefix=${PREFIX} --openssldir=${PREFIX}
-make all install_sw
diff --git a/.travis.yml b/.travis.yml
index 128a15b..b3d8ad1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,7 +7,10 @@ language: c
 
 env:
   global:
-    - PREFIX="${HOME}/opt"
+    - PREFIX=${HOME}/opt
+    - LD_LIBRARY_PATH=${PREFIX}/lib
+    - PATH=${PREFIX}/bin:${PATH}
+    - OPENSSL_ENGINES=${TRAVIS_BUILD_DIR}/bin
 
 matrix:
   include:
@@ -22,7 +25,11 @@ matrix:
 #      compiler: gcc
 
 before_script:
-  - .ci/build-openssl.sh > build.log 2>&1 || (cat build.log && exit 1)
+  - git clone -b ${OPENSSL_BRANCH} https://github.com/openssl/openssl.git
+  - cd openssl
+  - ./config shared --prefix=${PREFIX} --openssldir=${PREFIX} && make all install_sw > build.log 2>&1 || (cat build.log && exit 1)
+  - cd ..
 
 script:
-  - .ci/build-check.sh
+  - cmake -DOPENSSL_ROOT_DIR=${PREFIX} -DOPENSSL_LIBRARIES=${PREFIX}/lib && make
+  - prove -v test/{00-engine.t,01-digest.t,02-mac.t,03-encrypt.t}