From 601eaeedcd188cc0fddfd236f3f33989808b1fc8 Mon Sep 17 00:00:00 2001
From: Mark Driver <mdd31@alumni.cam.ac.uk>
Date: Tue, 21 Apr 2020 11:03:25 +0100
Subject: [PATCH] update gitlab CI to make sure changes are pulled.
---
.gitlab-ci.yml | 3 ++-
phasecalculator/runners/phasetransferrunner.py | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5382cbf..14863a6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -30,7 +30,8 @@ before_script:
- cd phasexmlparser
- pip install .
- cd ../
- - if [[ ! -d 'phasexmlcreator' ]]; then git clone https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.developers.cam.ac.uk/ch/hunter/ssiptools/ssimpleapps/phasexmlcreator.git; fi
+ - if [[ -d 'phasexmlcreator' ]]; then rm -r phasexmlcraetor; 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 ../
diff --git a/phasecalculator/runners/phasetransferrunner.py b/phasecalculator/runners/phasetransferrunner.py
index e7f48cb..673310b 100755
--- a/phasecalculator/runners/phasetransferrunner.py
+++ b/phasecalculator/runners/phasetransferrunner.py
@@ -165,7 +165,7 @@ def run_calculation(arg_list):
result of system call.
"""
- return subprocess.run(arg_list)
+ return subprocess.run(arg_list,capture_output=True)
def generate_vle_calc_args(jar_path, phase_filename, output_filename, **kwargs):
--
GitLab