From da984a1a80c1832917b636b8d7ee44c814a51ced Mon Sep 17 00:00:00 2001
From: Andre Anjos <andre.anjos@idiap.ch>
Date: Mon, 15 Oct 2018 08:20:41 +0200
Subject: [PATCH] Skip packages which are not supposed to be built for a given
arch; Be more verbose (still on issue #100)
---
gitlab/build.sh | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/gitlab/build.sh b/gitlab/build.sh
index c679009..4619f6a 100755
--- a/gitlab/build.sh
+++ b/gitlab/build.sh
@@ -20,12 +20,17 @@ BLDOPT="${BLDOPT} --variant-config-files ${SCRIPTS_DIR}/conda_build_config.yaml"
BLDOPT="${BLDOPT} --python=${PYTHON_VERSION}"
if [ -n "${BOB_TEST_ONLY}" ]; then
+ log_info "Running ${CONDA_ROOT}/bin/conda build ${BLDOPT} --output conda to generate package name..."
tarball=$(${CONDA_ROOT}/bin/conda build ${BLDOPT} --output conda)
+ if [ -z "${tarball}" ]; then
+ log_info "Package ${CI_PROJECT_PATH} is NOT supposed to be built for ${OS_SLUG}/python${PYTHON_VERSION} (cannot generate tarball name). Skipping..."
+ exit 0
+ fi
log_info "Only testing package ${tarball}..."
set_conda_channels ${VISIBILITY} ${CI_COMMIT_TAG}
if [ ! -r "${tarball}" ]; then
log_info "Package ${tarball} does not exist locally - checking channel ${CONDA_CHANNELS[0]}..."
- remote_name="${CONDA_CHANNELS[0]}/${OSNAME}-64/$(basename ${tarball})"
+ remote_name="${CONDA_CHANNELS[0]}/${OS_SLUG}/$(basename ${tarball})"
if url_exists ${remote_name}; then
log_info "Conda tarball exists in remote location, downloading..."
url_get ${tarball} ${remote_name}
--
GitLab