diff options
| author | Richard Maw <richard.maw@codethink.co.uk> | 2014-08-28 14:00:52 +0000 |
|---|---|---|
| committer | Richard Maw <richard.maw@codethink.co.uk> | 2014-08-28 14:00:52 +0000 |
| commit | 9c0011417081326ebb72d9ed02fcbbc456946dc4 (patch) | |
| tree | 5ea1ba505bb50ee616567f74551aadb2b51fa0d3 /yarns/architecture.yarn | |
| parent | 8c9aea626d1308a876d145d379ac5f23905fa9b4 (diff) | |
| parent | 1edbc9f5c08daafb3e13131dfc8df656b2a02edc (diff) | |
| download | morph-9c0011417081326ebb72d9ed02fcbbc456946dc4.tar.gz | |
Merge branch 'baserock/richardmaw/yarn-git-daemon'
Reviewed-by: Lars Wirzenius (git-daemon)
Reviewed-by: Sam Thursfield (yarn fixup)
Diffstat (limited to 'yarns/architecture.yarn')
| -rw-r--r-- | yarns/architecture.yarn | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/yarns/architecture.yarn b/yarns/architecture.yarn index 2240c428..d4de308e 100644 --- a/yarns/architecture.yarn +++ b/yarns/architecture.yarn @@ -9,6 +9,7 @@ Morph Cross-Building Tests AND the user attempts to build the system base-system-testarch.morph in branch master THEN morph failed AND the build error message includes the string "Are you trying to cross-build?" + FINALLY the git server is shut down Morph Cross-Bootstrap Tests @@ -20,3 +21,4 @@ Morph Cross-Bootstrap Tests AND a system called base-system-testarch.morph for the test architecture in the git server WHEN the user checks out the system branch called master THEN the user cross-bootstraps the system base-system-testarch.morph in branch master of repo test:morphs to the arch testarch + FINALLY the git server is shut down |