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

don't export conda paths

parent 07b02454
No related branches found
No related tags found
1 merge request!63Conda package based CI
...@@ -428,9 +428,3 @@ LANG="en_US.UTF-8" ...@@ -428,9 +428,3 @@ LANG="en_US.UTF-8"
LC_ALL="${LANG}" LC_ALL="${LANG}"
export_env LANG export_env LANG
export_env LC_ALL export_env LC_ALL
# ask conda to cache and build in the project directory
CONDA_ENVS_PATH="conda-env"
CONDA_BLD_PATH="conda-env"
export_env CONDA_ENVS_PATH
export_env CONDA_BLD_PATH
...@@ -16,14 +16,8 @@ stages: ...@@ -16,14 +16,8 @@ stages:
# Build targets # Build targets
.build_template: &build_job .build_template: &build_job
stage: build stage: build
script:
- ./_ci/build.sh
.build_linux_template: &linux_build_job
<<: *build_job
before_script: before_script:
- export CONDA_FOLDER=/opt/miniconda - export PATH=${CONDA_FOLDER}:$PATH
- export PATH=/opt/miniconda/bin:$PATH
- mkdir _ci - mkdir _ci
- curl https://curl.haxx.se/ca/cacert.pem > _ci/cacert.pem - curl https://curl.haxx.se/ca/cacert.pem > _ci/cacert.pem
- export CURL_CA_BUNDLE=`pwd`/_ci/cacert.pem - export CURL_CA_BUNDLE=`pwd`/_ci/cacert.pem
...@@ -31,6 +25,11 @@ stages: ...@@ -31,6 +25,11 @@ stages:
- curl "https://gitlab.idiap.ch/bob/bob.admin/raw/condapackage/gitlab/install.sh" > _ci/install.sh - curl "https://gitlab.idiap.ch/bob/bob.admin/raw/condapackage/gitlab/install.sh" > _ci/install.sh
- chmod 755 _ci/install.sh - chmod 755 _ci/install.sh
- ./_ci/install.sh _ci condapackage - ./_ci/install.sh _ci condapackage
script:
- ./_ci/build.sh
.build_linux_template: &linux_build_job
<<: *build_job
artifacts: artifacts:
expire_in: 1 week expire_in: 1 week
paths: paths:
...@@ -44,19 +43,11 @@ stages: ...@@ -44,19 +43,11 @@ stages:
paths: paths:
- ${CONDA_ENVS_PATH}/.pkgs/*.tar.bz2 - ${CONDA_ENVS_PATH}/.pkgs/*.tar.bz2
- ${CONDA_ENVS_PATH}/.pkgs/urls.txt - ${CONDA_ENVS_PATH}/.pkgs/urls.txt
variables: &linux_variables
CONDA_FOLDER: "/opt/miniconda"
.build_macosx_template: &macosx_build_job .build_macosx_template: &macosx_build_job
<<: *build_job <<: *build_job
before_script:
- export CONDA_FOLDER=$CI_PROJECT_DIR/${CONDA_ENVS_PATH}
- export PATH=$CI_PROJECT_DIR/${CONDA_ENVS_PATH}/bin:$PATH
- mkdir _ci
- curl https://curl.haxx.se/ca/cacert.pem > _ci/cacert.pem
- export CURL_CA_BUNDLE=`pwd`/_ci/cacert.pem
- export SSL_CERT_FILE=`pwd`/_ci/cacert.pem
- curl "https://gitlab.idiap.ch/bob/bob.admin/raw/condapackage/gitlab/install.sh" > _ci/install.sh
- chmod 755 _ci/install.sh
- ./_ci/install.sh _ci condapackage
artifacts: artifacts:
expire_in: 1 week expire_in: 1 week
paths: paths:
...@@ -69,21 +60,26 @@ stages: ...@@ -69,21 +60,26 @@ stages:
paths: paths:
- miniconda.sh - miniconda.sh
- ${CONDA_ENVS_PATH}/pkgs/ - ${CONDA_ENVS_PATH}/pkgs/
variables: &macosx_variables
CONDA_FOLDER: "${CI_PROJECT_DIR}/${CONDA_ENVS_PATH}"
build_linux_27: build_linux_27:
<<: *linux_build_job <<: *linux_build_job
variables: variables:
<<: * linux_variables
PYTHON_VERSION: "2.7" PYTHON_VERSION: "2.7"
build_linux_35: build_linux_35:
<<: *linux_build_job <<: *linux_build_job
variables: variables:
<<: * linux_variables
PYTHON_VERSION: "3.5" PYTHON_VERSION: "3.5"
build_linux_36: build_linux_36:
<<: *linux_build_job <<: *linux_build_job
variables: variables:
<<: * linux_variables
PYTHON_VERSION: "3.6" PYTHON_VERSION: "3.6"
BUILD_EGG: "true" BUILD_EGG: "true"
artifacts: artifacts:
...@@ -96,16 +92,19 @@ build_linux_36: ...@@ -96,16 +92,19 @@ build_linux_36:
build_macosx_27: build_macosx_27:
<<: *macosx_build_job <<: *macosx_build_job
variables: variables:
<<: * macosx_variables
PYTHON_VERSION: "2.7" PYTHON_VERSION: "2.7"
build_macosx_35: build_macosx_35:
<<: *macosx_build_job <<: *macosx_build_job
variables: variables:
<<: * macosx_variables
PYTHON_VERSION: "3.5" PYTHON_VERSION: "3.5"
build_macosx_36: build_macosx_36:
<<: *macosx_build_job <<: *macosx_build_job
variables: variables:
<<: * macosx_variables
PYTHON_VERSION: "3.6" PYTHON_VERSION: "3.6"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment