diff options
| author | Richard Maw <richard.maw@codethink.co.uk> | 2015-04-30 02:43:08 +0000 |
|---|---|---|
| committer | Richard Maw <richard.maw@codethink.co.uk> | 2015-05-11 13:13:50 +0000 |
| commit | 2d2774a3b84ce9dba9b4445e842801c2768cdaa3 (patch) | |
| tree | ffe86fb8e0cdd243ed7666284fd56a26545cbea7 /yarns | |
| parent | e2e2ededbad299b253444b29d6d228152ef2cead (diff) | |
| download | morph-2d2774a3b84ce9dba9b4445e842801c2768cdaa3.tar.gz | |
yarns: Add the ability to tag chunks and commit updates to definitions
Change-Id: Ia644ddfaa5138f0ad459099cf26f51b545a9f9ca
Diffstat (limited to 'yarns')
| -rw-r--r-- | yarns/implementations.yarn | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/yarns/implementations.yarn b/yarns/implementations.yarn index befd503e..d11f8752 100644 --- a/yarns/implementations.yarn +++ b/yarns/implementations.yarn @@ -39,6 +39,9 @@ we can test it later in a THEN step. ;; esac + IMPLEMENTS THEN morph output (.*) + grep -q "$MATCH_1" "$DATADIR/out-latest" + We need to check that a workspace creation worked. This requires the directory to exist, and its `.morph` subdirectory to exist, and nothing else. @@ -723,6 +726,10 @@ Generating a manifest. die "Output isn't what we expect" fi + IMPLEMENTS WHEN the user commits all changes in system branch (\S+) + cd "$DATADIR/workspace/$MATCH_1/test/morphs" + git commit -a --allow-empty -m 'Commit all changes' + Implementations for temporary build branch handling --------------------------------------------------- @@ -1052,6 +1059,11 @@ Altering morphologies in their source repositories git add "$MATCH_1" git commit -m "Make $MATCH_1 match $MATCH_2" + IMPLEMENTS WHEN chunk repository (\S+) is re-tagged as (\S+) + cd "$DATADIR/gits/$MATCH_1" + git commit --allow-empty -m "Prepare for $MATCH_2" + git tag -af -m "Release $MATCH_2" "$MATCH_2" + Altering morphologies in the workspace -------------------------------------- @@ -1062,6 +1074,12 @@ Altering morphologies in the workspace "$SRCDIR/scripts/edit-morph" set-stratum-match-rules \ "$MATCH_1" "$MATCH_3" + IMPLEMENTS WHEN chunk (\S+) in stratum (\S+) in system branch (\S+) is updated to use (\S+) from chunk repository (\S+) + cd "$DATADIR/workspace/$MATCH_3/test/morphs" + sha1=$(cd "$DATADIR/gits/$MATCH_5" && git rev-parse "$MATCH_4") + "$SRCDIR/scripts/edit-morph" update-stratum-chunk-ref \ + "$MATCH_2" "$MATCH_1" "$sha1" + ### Altering clusters ### IMPLEMENTS GIVEN a cluster called (\S+) in system branch (\S+) |