diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2015-07-23 17:48:03 +0100 |
|---|---|---|
| committer | Baserock Gerrit <gerrit@baserock.org> | 2015-09-18 15:50:19 +0000 |
| commit | 81ebe71089d802061c2c3cb03bfd548388d04cb8 (patch) | |
| tree | 207ec00ee9ca045825dc52560d6ab6ee36e81e7b /tests.build/build-stratum-with-submodules.script | |
| parent | a4d8098b229592db40565747b0444b518bf8a6eb (diff) | |
| download | morph-81ebe71089d802061c2c3cb03bfd548388d04cb8.tar.gz | |
Remove support for Baserock definitions format versions 3, 4 and 5
Change-Id: Iad95af65bd5c528d2e72f5b2ffa80a01152f50ff
Diffstat (limited to 'tests.build/build-stratum-with-submodules.script')
| -rwxr-xr-x | tests.build/build-stratum-with-submodules.script | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/tests.build/build-stratum-with-submodules.script b/tests.build/build-stratum-with-submodules.script index bd6b97ce..2dd2b924 100755 --- a/tests.build/build-stratum-with-submodules.script +++ b/tests.build/build-stratum-with-submodules.script @@ -24,13 +24,7 @@ set -eu parent="$DATADIR/parent-repo" mkdir "$parent" -cat <<EOF > "$parent/parent.morph" -name: parent -kind: chunk -build-system: manual -build-commands: - - test -f le-sub/README -EOF +echo "No real content here" > "$parent/dummy" "$SRCDIR/scripts/run-git-in" "$parent" init --quiet "$SRCDIR/scripts/run-git-in" "$parent" add . @@ -42,6 +36,14 @@ EOF # Modify the stratum to refer to the parent, not the submodule. morphs="$DATADIR/morphs-repo" +cat <<EOF > "$morphs/parent.morph" +name: parent +kind: chunk +build-system: manual +build-commands: + - test -f le-sub/README +EOF + cat <<EOF > "$morphs/hello-stratum.morph" name: hello-stratum kind: stratum @@ -49,10 +51,11 @@ chunks: - name: parent repo: test:parent-repo ref: master + morph: parent.morph build-depends: [] build-mode: test EOF -"$SRCDIR/scripts/run-git-in" "$morphs" add hello-stratum.morph +"$SRCDIR/scripts/run-git-in" "$morphs" add hello-stratum.morph parent.morph "$SRCDIR/scripts/run-git-in" "$morphs" commit --quiet -m 'foo' |