From 7ba831a3bc3f0e24bab50384da8b47202cd35a2f Mon Sep 17 00:00:00 2001
From: Andre Anjos <andre.anjos@idiap.ch>
Date: Fri, 23 Sep 2016 17:51:37 +0200
Subject: [PATCH] Set LD_LIBRARY_PATH
---
gitlab/before_test.sh | 4 ++--
gitlab/functions.sh | 1 +
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/gitlab/before_test.sh b/gitlab/before_test.sh
index 80cf712..6181d97 100755
--- a/gitlab/before_test.sh
+++ b/gitlab/before_test.sh
@@ -23,7 +23,7 @@ fi
# zc.recipe.egg needs some special installation instructions
if [ "${CI_PROJECT_NAME}" == "bob.buildout" ]; then
- run_cmd ${use_pip} install --no-binary ":all:" zc.recipe.egg
+ run_cmd ${use_pip} install --upgrade --no-binary ":all:" zc.recipe.egg
fi
-run_cmd ${use_pip} install --use-wheel --no-index --pre dist/*.whl
+run_cmd ${use_pip} install --upgrade --use-wheel --no-index --pre dist/*.whl
diff --git a/gitlab/functions.sh b/gitlab/functions.sh
index e7f6c3a..81cebf6 100644
--- a/gitlab/functions.sh
+++ b/gitlab/functions.sh
@@ -156,6 +156,7 @@ fi
PYVER=py$(echo ${PYTHON_VERSION} | tr -d '.')
BOB_PREFIX_PATH=${CONDA_FOLDER}/envs/bob-devel-${PYVER}
+LD_LIBRARY_PATH=${BOB_PREFIX_PATH}/lib
BOB_DOCUMENTATION_SERVER="${DOCSERVER}/software/bob/docs/latest/bob/%s/master/"
if [ -z "${PYPISERVER}" ]; then
--
GitLab