diff --git a/gitlab/before_deploy.sh b/gitlab/before_deploy.sh index f2b32a186075957d777ef3b60698e86d780e6776..25fc0bab0f3ef5f875ee4619e5849231a6a70856 100755 --- a/gitlab/before_deploy.sh +++ b/gitlab/before_deploy.sh @@ -3,11 +3,4 @@ source $(dirname ${0})/functions.sh -check_env DOCSERVER -check_env CONDA_PREFIX - -BOB_DOCUMENTATION_SERVER="${DOCSERVER}/software/bob/docs/latest/bob/%s/master/" -PREFIX=`pwd`/${CONDA_PREFIX} - -run_cmd $(dirname ${0})/before_build.sh -run_cmd ${PREFIX}/bin/pip install --use-wheel --no-index --pre dist/*.whl +run_cmd $(dirname ${0})/before_test.sh diff --git a/gitlab/before_test.sh b/gitlab/before_test.sh index 1305f3e460566a088bdcb249689a7f40ab6a5e85..f2b32a186075957d777ef3b60698e86d780e6776 100755 --- a/gitlab/before_test.sh +++ b/gitlab/before_test.sh @@ -1,4 +1,13 @@ #!/usr/bin/env bash # Wed 21 Sep 2016 13:08:05 CEST -run_cmd $(dirname ${0})/before_test.sh +source $(dirname ${0})/functions.sh + +check_env DOCSERVER +check_env CONDA_PREFIX + +BOB_DOCUMENTATION_SERVER="${DOCSERVER}/software/bob/docs/latest/bob/%s/master/" +PREFIX=`pwd`/${CONDA_PREFIX} + +run_cmd $(dirname ${0})/before_build.sh +run_cmd ${PREFIX}/bin/pip install --use-wheel --no-index --pre dist/*.whl