From 56f996b81d3843b9d2a131dd778912f9ebd57f48 Mon Sep 17 00:00:00 2001 From: Richard Maw Date: Fri, 6 Dec 2013 11:09:58 +0000 Subject: 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. --- yarns/building.yarn | 2 +- yarns/implementations.yarn | 4 ++-- yarns/regression.yarn | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'yarns') diff --git a/yarns/building.yarn b/yarns/building.yarn index 5b6b29a0..cc45df65 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 0fad95be..dc8f06af 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 eae01343..49c663ec 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 -- cgit v1.2.1