Skip to content
Snippets Groups Projects
Commit f7377f49 authored by André Anjos's avatar André Anjos :speech_balloon:
Browse files

Merge branch 'master' into staging 

Conflicts:
	gitlab/functions.sh
parents d32fa769 d4f03f74
No related branches found
No related tags found
1 merge request!42Staging
Hide whitespace changes
Inline Side-by-side
Showing
with 2 additions and 2 deletions
gitlab/functions.sh
+ 2
− 2
View file @ f7377f49
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
# Build utilities # Build utilities
# Determines the os name we're using # Determines the operating system we're using
osname() { osname() {
[[ "$(uname -s)" == "Darwin" ]] && echo "macosx" || echo "linux" [[ "$(uname -s)" == "Darwin" ]] && echo "macosx" || echo "linux"
} }
...@@ -277,12 +277,12 @@ check_env OSNAME ...@@ -277,12 +277,12 @@ check_env OSNAME
check_env PYVER check_env PYVER
check_env PREFIX check_env PREFIX
export_env PREFIX export_env PREFIX
export_env BOB_PREFIX_PATH
check_env DOCSERVER check_env DOCSERVER
check_env PYPISERVER check_env PYPISERVER
check_env TESTSERVER check_env TESTSERVER
check_env CONDA_FOLDER check_env CONDA_FOLDER
check_env CONDA_ENV check_env CONDA_ENV
export_env BOB_PREFIX_PATH
if [ -z "${CI_BUILD_TAG}" ]; then if [ -z "${CI_BUILD_TAG}" ]; then
DEFSRV="${DOCSERVER}/software/bob/docs/latest/bob/%s/master/" DEFSRV="${DOCSERVER}/software/bob/docs/latest/bob/%s/master/"
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment