diff options
| author | Jannis Pohlmann <jannis.pohlmann@codethink.co.uk> | 2012-09-04 17:42:32 +0000 |
|---|---|---|
| committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2012-09-07 18:14:44 +0100 |
| commit | f55a1228d09f2661ef83ba5d0d12b0363a48412b (patch) | |
| tree | 0287aa1c06b7373d3aeea7ccfa35463347035f13 /tests.branching/edit-updates-stratum.stdout | |
| parent | 204f272d5a2c3471a1e796132bc16dec72a8f926 (diff) | |
| download | morph-f55a1228d09f2661ef83ba5d0d12b0363a48412b.tar.gz | |
Add a new 'morph build' for building from a system branch
This new command does a lot. First of all, its command line interface
has now changed to 'morph build SYSTEM' and it needs to be run from
a system branch.
When called, the new 'build' command will identify the repositories
and morphologies involved in building the system from the system branch,
create a build ref behind the scenes based on the system branch and add a
commit with all uncommitted changes to this build branch for every repo
involved. It will then push those build branches to the repository server
and kick off a build of BRANCH_ROOT BUILD_BRANCH SYSTEM.morph.
After building has finished, the remote build branches will be
deleted again.
Diffstat (limited to 'tests.branching/edit-updates-stratum.stdout')
| -rw-r--r-- | tests.branching/edit-updates-stratum.stdout | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tests.branching/edit-updates-stratum.stdout b/tests.branching/edit-updates-stratum.stdout index c29f3a9e..a61be053 100644 --- a/tests.branching/edit-updates-stratum.stdout +++ b/tests.branching/edit-updates-stratum.stdout @@ -25,15 +25,17 @@ index 006a96c..ad8c08b 100644 + "name": "hello-stratum" } diff --git a/hello-system.morph b/hello-system.morph -index 8dbcf67..db4f1f2 100644 +index 1a33ed6..d5aae46 100644 --- a/hello-system.morph +++ b/hello-system.morph -@@ -1,13 +1,14 @@ +@@ -1,14 +1,15 @@ { - "name": "hello-system", - "kind": "system", - "system-kind": "syslinux-disk", +- "arch": "x86_64", - "disk-size": "1G", ++ "arch": "x86_64", + "build-system": "manual", + "disk-size": 1073741824, + "kind": "system", |