From 7170ee945bc3749c1b0e414486b7b0f1be9685d1 Mon Sep 17 00:00:00 2001
From: Amir MOHAMMADI <amir.mohammadi@idiap.ch>
Date: Fri, 22 Sep 2017 12:16:28 +0200
Subject: [PATCH] check os name properly
---
gitlab/deploy.sh | 2 +-
gitlab/functions.sh | 6 +++---
templates/gitlab-ci.yml | 7 +++----
3 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/gitlab/deploy.sh b/gitlab/deploy.sh
index a69da38..62aae11 100755
--- a/gitlab/deploy.sh
+++ b/gitlab/deploy.sh
@@ -5,7 +5,7 @@ source $(dirname ${0})/functions.sh
# Uploads all the built packages
for os in "osx-64" "noarch" "linux-64"; do
- for f in ${CONDA_BLD_PATH}/${os}/*.tar.bz2; do
+ for f in ${CONDA_ENVS_PATH}/${os}/*.tar.bz2; do
if [[ -f $f ]]; then
if [ -z "${CI_COMMIT_TAG}" ]; then #beta
url="private"
diff --git a/gitlab/functions.sh b/gitlab/functions.sh
index cf1fde3..84b06cb 100644
--- a/gitlab/functions.sh
+++ b/gitlab/functions.sh
@@ -270,10 +270,10 @@ install_miniconda() {
log_info "Installing miniconda in ${1} ..."
# Download the latest conda installation script
- if [ "${OSNAME}" == "macosx" ]; then
- object=https://repo.continuum.io/miniconda/Miniconda3-latest-MacOSX-x86_64.sh
- else
+ if [ "${OSNAME}" == "linux" ]; then
object=https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh
+ else
+ object=https://repo.continuum.io/miniconda/Miniconda3-latest-MacOSX-x86_64.sh
fi
# check if miniconda.sh exists
diff --git a/templates/gitlab-ci.yml b/templates/gitlab-ci.yml
index c1c8347..5e885e3 100644
--- a/templates/gitlab-ci.yml
+++ b/templates/gitlab-ci.yml
@@ -4,7 +4,6 @@
# global variables
variables:
CONDA_ENVS_PATH: "conda-env"
- CONDA_BLD_PATH: "conda-env/conda-bld"
# Definition of our build pipeline order
@@ -36,7 +35,7 @@ stages:
expire_in: 1 week
paths:
- _ci/
- - ${CONDA_BLD_PATH}/linux-64/*.tar.bz2
+ - ${CONDA_ENVS_PATH}/linux-64/*.tar.bz2
tags:
- docker
image: continuumio/conda_builder_linux
@@ -62,7 +61,7 @@ stages:
expire_in: 1 week
paths:
- _ci/
- - ${CONDA_BLD_PATH}/osx-64/*.tar.bz2
+ - ${CONDA_ENVS_PATH}/osx-64/*.tar.bz2
tags:
- conda-macosx
cache:
@@ -92,7 +91,7 @@ build_linux_36:
paths:
- _ci/
- dist/
- - ${CONDA_BLD_PATH}/linux-64/*.tar.bz2
+ - ${CONDA_ENVS_PATH}/linux-64/*.tar.bz2
build_macosx_27:
<<: *macosx_build_job
--
GitLab