summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Maw <richard.maw@codethink.co.uk>2014-10-02 12:23:20 +0000
committerRichard Maw <richard.maw@codethink.co.uk>2014-10-02 13:09:32 +0000
commit73df0d4ff32bf0f472eb81b16b36ae3fb18bae8f (patch)
treeefab45182fb8e228369c7109e57e04d99a7affe1
parente0687d4f9014919dda15fa41b48d7ce8f6ffa401 (diff)
downloadmorph-73df0d4ff32bf0f472eb81b16b36ae3fb18bae8f.tar.gz
Only attempt to run distbuild yarns if possible
You need both bottle and flup for this to work, and it would wait forever for a cache-server that is never going to start unless you have bottle and flup. So we now check whether the cache server is functional before attempting distbuild tests.
-rw-r--r--yarns/building.yarn1
-rw-r--r--yarns/implementations.yarn3
2 files changed, 4 insertions, 0 deletions
diff --git a/yarns/building.yarn b/yarns/building.yarn
index 5f79aa3c..52742ac8 100644
--- a/yarns/building.yarn
+++ b/yarns/building.yarn
@@ -10,6 +10,7 @@ Morph Building Tests
FINALLY the git server is shut down
SCENARIO distbuilding
+ ASSUMING the morph-cache-server can be run
GIVEN a workspace
AND a git server
AND a communal cache server
diff --git a/yarns/implementations.yarn b/yarns/implementations.yarn
index 0c0daf79..6748e3d3 100644
--- a/yarns/implementations.yarn
+++ b/yarns/implementations.yarn
@@ -984,6 +984,9 @@ Altering morphologies in the workspace
Distbuild
=========
+ IMPLEMENTS ASSUMING the morph-cache-server can be run
+ "$SRCDIR/morph-cache-server" --version
+
IMPLEMENTS GIVEN a communal cache server
# The communal cache server has direct access to the git repositories
# and can have artifacts placed on it