summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Maw <richard.maw@codethink.co.uk>2013-12-06 11:09:58 (GMT)
committerRichard Maw <richard.maw@codethink.co.uk>2014-01-09 15:07:42 (GMT)
commit56f996b81d3843b9d2a131dd778912f9ebd57f48 (patch)
treea55bd7f44034055d65e7c69656ced38842b08a3b
parent87adff1b40ab0e3ce512185fa3fd4ecc641e0b32 (diff)
downloadmorph-56f996b81d3843b9d2a131dd778912f9ebd57f48.tar.gz
yarns: Remove redundant repo in IMPLEMENTS THEN
morph build the system... doesn't need the repository to be specified, just the branch; morph is able to work it out for itself.
-rw-r--r--yarns/building.yarn2
-rw-r--r--yarns/implementations.yarn4
-rw-r--r--yarns/regression.yarn2
3 files changed, 4 insertions, 4 deletions
diff --git a/yarns/building.yarn b/yarns/building.yarn
index 5b6b29a..cc45df6 100644
--- a/yarns/building.yarn
+++ b/yarns/building.yarn
@@ -6,4 +6,4 @@ Morph Building Tests
AND a git server
WHEN the user checks out the system branch called master
AND the user creates an uncommitted system morphology called base-system for our architecture in system branch master
- THEN morph build the system base-system of the branch master of the repo test:morphs
+ THEN morph build the system base-system of the branch master
diff --git a/yarns/implementations.yarn b/yarns/implementations.yarn
index 0fad95b..dc8f06a 100644
--- a/yarns/implementations.yarn
+++ b/yarns/implementations.yarn
@@ -616,6 +616,6 @@ variables in `$DATADIR/env`. We treat the value as a format string for
Implementations for building systems
------------------------------------
- IMPLEMENTS THEN morph build the system (\S+) of the (branch|tag) (\S+) of the repo (\S+)
- cd "$DATADIR/workspace/$MATCH_3/$MATCH_4"
+ IMPLEMENTS THEN morph build the system (\S+) of the (branch|tag) (\S+)
+ cd "$DATADIR/workspace/$MATCH_3"
run_morph build "$MATCH_1"
diff --git a/yarns/regression.yarn b/yarns/regression.yarn
index eae0134..49c663e 100644
--- a/yarns/regression.yarn
+++ b/yarns/regression.yarn
@@ -10,7 +10,7 @@ Testing if we can build after checking out from a tag.
GIVEN a workspace
AND a git server
WHEN the user checks out the system tag called test-tag
- THEN morph build the system test-system of the tag test-tag of the repo test:morphs
+ THEN morph build the system test-system of the tag test-tag
Running `morph branch` when the branch directory exists doesn't