diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2014-06-09 14:00:26 +0000 |
|---|---|---|
| committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2014-06-09 14:00:26 +0000 |
| commit | b6f37209fc277883c983b1602d3a98b4045f6dee (patch) | |
| tree | 7e502b0a9abe2c736b9f8260a8e984fc91e20539 /tests.deploy/setup-build | |
| parent | e88455c62914ed70b439b37c2ba64a446cb295c3 (diff) | |
| parent | 051ed7f0753ac292964019bb00929380f98b2191 (diff) | |
| download | morph-b6f37209fc277883c983b1602d3a98b4045f6dee.tar.gz | |
Merge branch 'baserock/ps/simple-edit-syntax'
Reviewed-By: Adam Coldrick <adam.coldrick@codethink.co.uk>
Reviewed-By: Richard Ipsum <richard.ipsum@codethink.co.uk>
Reviewed-By: Richard Maw <richard.maw@codethink.co.uk>
Reviewed-By: Sam Thursfield <sam.thursfield@codethink.co.uk>
Diffstat (limited to 'tests.deploy/setup-build')
| -rw-r--r-- | tests.deploy/setup-build | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests.deploy/setup-build b/tests.deploy/setup-build index 0fc561f9..c6b24da5 100644 --- a/tests.deploy/setup-build +++ b/tests.deploy/setup-build @@ -23,7 +23,7 @@ source "$SRCDIR/scripts/fix-committer-info" cd "$DATADIR/workspace" "$SRCDIR/scripts/test-morph" init "$SRCDIR/scripts/test-morph" branch test:morphs branch1 -"$SRCDIR/scripts/test-morph" edit linux-system linux-stratum linux +"$SRCDIR/scripts/test-morph" edit linux # Fix UUID's in the checked out repos to make build branch names deterministic git config -f "$DATADIR/workspace/branch1/.morph-system-branch/config" \ |