From 14744f8b2fac55bcb97eca69ced55070568c482d Mon Sep 17 00:00:00 2001
From: u214892 <u214892@sbb.ch>
Date: Fri, 12 Jul 2019 13:05:50 +0200
Subject: [PATCH] #97 tox-conda #94 use miniconda instead of anaconda
---
.gitlab-ci.yml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ff90e754..977121ed 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -30,7 +30,7 @@ tests:
- bash /tmp/Miniconda3-latest-Linux-x86_64.sh -b -p /tmp/miniconda3
- export PATH=/tmp/miniconda3/bin:$PATH
- pip install tox awscli
- - conda update -n conda -y
+ - conda update -n root conda -y
- conda install -c conda-forge tox-conda
script:
- xvfb-run tox -v --recreate
@@ -51,7 +51,7 @@ build_and_deploy_docs:
- bash /tmp/Miniconda3-latest-Linux-x86_64.sh -b -p /tmp/miniconda3
- export PATH=/tmp/miniconda3/bin:$PATH
- pip install tox awscli
- - conda update -n conda -y
+ - conda update -n root conda -y
- conda install -c conda-forge tox-conda
script:
- echo "Bucket=${BUCKET_NAME}"
@@ -77,7 +77,7 @@ benchmarks_and_profiling:
- bash /tmp/Miniconda3-latest-Linux-x86_64.sh -b -p /tmp/miniconda3
- export PATH=/tmp/miniconda3/bin:$PATH
- pip install tox awscli
- - conda update -n conda -y
+ - conda update -n root conda -y
- conda install -c conda-forge tox-conda
script:
- xvfb-run tox -e benchmarks,profiling -v --recreate
@@ -89,7 +89,7 @@ test_conda_setup:
- apt install -y libgl1-mesa-glx xvfb graphviz xdg-utils libcairo2-dev libjpeg-dev libgif-dev
- wget -nv https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86_64.sh -O /tmp/Miniconda3-latest-Linux-x86_64.sh
- bash /tmp/Miniconda3-latest-Linux-x86_64.sh -b -p /tmp/miniconda3
- - conda update -n conda -y
+ - conda update -n root conda -y
script:
- export PATH=/tmp/miniconda3/bin:$PATH
- bash getting_started/getting_started.sh
--
GitLab