Skip to content
Snippets Groups Projects
Commit 7170ee94 authored by Amir MOHAMMADI's avatar Amir MOHAMMADI
Browse files

check os name properly

parent 754ef0aa
No related branches found
No related tags found
1 merge request!63Conda package based CI
......@@ -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"
......
......@@ -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
......
......@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment