min
/
boring2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Little circle cleanup

This commit is contained in:
Steven Fackler 2017-07-27 19:59:24 -07:00
parent 8fa9b58743
commit 381267816f
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
circle.yml
View File

@ -15,20 +15,17 @@ job: &JOB
- ~/.cargo/registry/index - ~/.cargo/registry/index
- run: echo "${LIBRARY}-${VERSION}-${TARGET}" > ~/lib_key - run: echo "${LIBRARY}-${VERSION}-${TARGET}" > ~/lib_key
- restore_cache: - restore_cache:
key: lib-{{ checksum "~/lib_key" }}-{{ checksum "test/build_openssl.sh"}} key: lib-{{ checksum "~/lib_key" }}-{{ checksum "test/build_openssl.sh" }}
- run: ./test/build_openssl.sh - run: ./test/build_openssl.sh
- save_cache: - save_cache:
key: lib-{{ checksum "~/lib_key" }}-{{ checksum "test/build_openssl.sh"}} key: lib-{{ checksum "~/lib_key" }}-{{ checksum "test/build_openssl.sh" }}
paths: paths:
- ~/openssl - /openssl
- restore_cache: - restore_cache:
key: deps-1.19.0-{{ checksum "Cargo.lock" }}-{{ checksum "~/lib_key" }} key: deps-1.19.0-{{ checksum "Cargo.lock" }}-{{ checksum "~/lib_key" }}
- run: | - run: cargo run --manifest-path=systest/Cargo.toml --target $TARGET
export OPENSSL_DIR=$HOME/openssl
cargo run --manifest-path=systest/Cargo.toml --target $TARGET
- run: | - run: |
ulimit -c unlimited ulimit -c unlimited
export OPENSSL_DIR=$HOME/openssl
export PATH=$OPENSSL_DIR/bin:$PATH export PATH=$OPENSSL_DIR/bin:$PATH
if [ "${NO_RUN}" = "1" ]; then if [ "${NO_RUN}" = "1" ]; then
TEST_ARGS=--no-run TEST_ARGS=--no-run
@ -81,6 +78,7 @@ armhf: &ARMHF
base: &BASE base: &BASE
RUST_BACKTRACE: 1 RUST_BACKTRACE: 1
OPENSSL_DIR: /openssl
version: 2 version: 2
jobs: jobs:

5
test/build_openssl.sh
View File

@ -43,13 +43,12 @@ curl -o ${OUT} -L --max-redirs ${MAX_REDIRECTS} ${URL1} \
tar --strip-components=1 -xzf ${OUT} tar --strip-components=1 -xzf ${OUT}
PREFIX=${HOME}/openssl
case "${LIBRARY}" in case "${LIBRARY}" in
"openssl") "openssl")
./Configure --prefix=${PREFIX} ${OS_COMPILER} -fPIC -g ${OS_FLAGS} no-shared ./Configure --prefix=${OPENSSL_DIR} ${OS_COMPILER} -fPIC -g ${OS_FLAGS} no-shared
;; ;;
"libressl") "libressl")
./configure --prefix=${PREFIX} --disable-shared --with-pic ./configure --prefix=${OPENSSL_DIR} --disable-shared --with-pic
;; ;;
esac esac