From 8c5a8a59d12b72746893043076d9f80f07737c74 Mon Sep 17 00:00:00 2001 From: Amir MOHAMMADI <amir.mohammadi@idiap.ch> Date: Fri, 9 Feb 2018 17:05:12 +0100 Subject: [PATCH] the install script can be run from anywhere --- gitlab/build.sh | 3 +++ gitlab/install.sh | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/gitlab/build.sh b/gitlab/build.sh index f92bc05..ef92a4d 100755 --- a/gitlab/build.sh +++ b/gitlab/build.sh @@ -20,4 +20,7 @@ fi BOB_BUILD_NUMBER=`head -n 1 ./_ci/${OS_SLUG}/${PYTHON_VERSION}/build_number.txt | tr -d '\n'` export_env BOB_BUILD_NUMBER +# copy the recipe_append.yaml over before build +run_cmd cp ./ci/recipe_append.yaml conda/recipe_append.yaml + run_cmd ${CONDA_ROOT}/bin/conda build --no-anaconda-upload --variant-config-files _ci/conda_build_config.yaml --python=${PYTHON_VERSION} conda diff --git a/gitlab/install.sh b/gitlab/install.sh index d008f78..78d4808 100755 --- a/gitlab/install.sh +++ b/gitlab/install.sh @@ -60,7 +60,7 @@ run_cmd mkdir -pv ${1} get_script ${1} cacert.pem get_script ${1} functions.sh get_script ${1} conda_build_config.yaml -get_script ${1}/../conda recipe_append.yaml +get_script ${1} recipe_append.yaml get_exec ${1} before_build.sh for stage in "build" "deploy" "pypi"; do get_exec ${1} ${stage}.sh -- GitLab