diff --git a/gitlab/after_docs.sh b/gitlab/after_docs.sh index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..73a037624bb88e0aed6b9d09f5c6aa0291b38784 100755 --- a/gitlab/after_docs.sh +++ b/gitlab/after_docs.sh @@ -0,0 +1,2 @@ +#!/usr/bin/env bash +# Thu 22 Sep 2016 18:23:57 CEST diff --git a/gitlab/after_wheels.sh b/gitlab/after_wheels.sh index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..73a037624bb88e0aed6b9d09f5c6aa0291b38784 100755 --- a/gitlab/after_wheels.sh +++ b/gitlab/after_wheels.sh @@ -0,0 +1,2 @@ +#!/usr/bin/env bash +# Thu 22 Sep 2016 18:23:57 CEST diff --git a/gitlab/before_docs.sh b/gitlab/before_docs.sh index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..73a037624bb88e0aed6b9d09f5c6aa0291b38784 100755 --- a/gitlab/before_docs.sh +++ b/gitlab/before_docs.sh @@ -0,0 +1,2 @@ +#!/usr/bin/env bash +# Thu 22 Sep 2016 18:23:57 CEST diff --git a/gitlab/before_test.sh b/gitlab/before_test.sh index f2b32a186075957d777ef3b60698e86d780e6776..1305f3e460566a088bdcb249689a7f40ab6a5e85 100755 --- a/gitlab/before_test.sh +++ b/gitlab/before_test.sh @@ -1,13 +1,4 @@ #!/usr/bin/env bash # Wed 21 Sep 2016 13:08:05 CEST -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_wheels.sh b/gitlab/before_wheels.sh index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..73a037624bb88e0aed6b9d09f5c6aa0291b38784 100755 --- a/gitlab/before_wheels.sh +++ b/gitlab/before_wheels.sh @@ -0,0 +1,2 @@ +#!/usr/bin/env bash +# Thu 22 Sep 2016 18:23:57 CEST diff --git a/gitlab/functions.sh b/gitlab/functions.sh index 7c5a49dc8f9c68f9d2cfbca8e9deb9c1a2e05552..a29876d1c053795567f146926b3ee8dcfd9d364c 100644 --- a/gitlab/functions.sh +++ b/gitlab/functions.sh @@ -11,17 +11,17 @@ arch() { # Functions for coloring echo commands log_info() { - echo -e "\033[1;32m[`date +%c`] ${@}\033[0m" + echo -e "\033[1;32m(`date +%T`) ${@}\033[0m" } log_warn() { - echo -e "\033[1;33m[`date +%c`] ${@}\033[0m" + echo -e "\033[1;33m(`date +%T`) ${@}\033[0m" } log_error() { - echo -e "\033[1;31m[`date +%c`] ${@}\033[0m" + echo -e "\033[1;31m(`date +%T`) ${@}\033[0m" } diff --git a/gitlab/install.sh b/gitlab/install.sh index 3cc2f6dbe40de765fe8f9e913c1fedcfd936a174..836ec6976ceeb258732194f7864c8c6e160983a8 100755 --- a/gitlab/install.sh +++ b/gitlab/install.sh @@ -11,11 +11,11 @@ fi # Functions for coloring echo commands log_info() { - echo -e "\033[1;32m[`date +%c`] ${@}\033[0m" + echo -e "\033[1;32m(`date +%T`) ${@}\033[0m" } log_error() { - echo -e "\033[1;31m[`date +%c`] ${@}\033[0m" + echo -e "\033[1;31m(`date +%T`) ${@}\033[0m" } # Function for running command and echoing results @@ -42,18 +42,8 @@ get_exec() { run_cmd mkdir -pv ${1} get_script ${1} functions.sh -get_exec ${1} before_build.sh -get_exec ${1} build.sh -get_exec ${1} after_build.sh -get_exec ${1} before_test.sh -get_exec ${1} test.sh -get_exec ${1} after_test.sh -get_exec ${1} before_wheels.sh -get_exec ${1} wheels.sh -get_exec ${1} after_wheels.sh -get_exec ${1} before_docs.sh -get_exec ${1} docs.sh -get_exec ${1} after_docs.sh -get_exec ${1} before_deploy.sh -get_exec ${1} deploy.sh -get_exec ${1} after_deploy.sh +for stage in "build" "test" "wheels" "deploy"; do + get_exec ${1} before_${stage}.sh + get_exec ${1} ${stage}.sh + get_exec ${1} after_${stage}.sh +done