From ffd08056ac822c2f59ca87017a3418867d54bbaa Mon Sep 17 00:00:00 2001
From: "M. Driver" <mdd31@cantab.ac.uk>
Date: Sat, 16 Oct 2021 15:26:01 +0200
Subject: [PATCH] update to use conda deployed versions.
---
.gitlab-ci.yml | 16 +---------------
1 file changed, 1 insertion(+), 15 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f0baf0f..e8f8104 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -14,23 +14,9 @@ before_script:
- apt-get -y install -f openjdk-11-jre-headless texlive-latex-extra dvipng
- conda env create -f environment.yml
- source activate resultsanalysis
- - conda install -c conda-forge phasexmlparser phasexmlcreator
+ - conda install -c conda-forge phasexmlparser phasexmlcreator resultsanalysis puresolventinformation
- ls
- cd ../
- - if [[ ! -d 'resultsanalysis' ]]; then git clone https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.developers.cam.ac.uk/ch/hunter/ssiptools/utils/resultsanalysis.git; fi
- - cd resultsanalysis
- - pip install .
- - cd ../
- - if [[ -d 'phasexmlcreator' ]]; then rm -r phasexmlcreator; fi
- - git clone https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.developers.cam.ac.uk/ch/hunter/ssiptools/ssimpleapps/phasexmlcreator.git
- - cd phasexmlcreator
- - pip install .
- - cd ../
- - if [[ -d 'puresolventinformation' ]]; then rm -r puresolventinformation; fi
- - git clone https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.developers.cam.ac.uk/ch/hunter/ssiptools/ssimpleapps/puresolventinformation.git
- - cd puresolventinformation
- - pip install .
- - cd ../
- if [[ -d 'solventmapcreator' ]]; then rm -r solventmapcreator; fi
- git clone https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.developers.cam.ac.uk/ch/hunter/ssiptools/ssimpleapps/solventmapcreator.git
- cd solventmapcreator
--
GitLab