summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKieran Bingham <kieran.bingham+renesas@ideasonboard.com>2018-11-01 13:39:53 +0000
committerKieran Bingham <kieran.bingham+renesas@ideasonboard.com>2018-12-07 13:24:50 +0000
commitebca47c71471bcff1ff975707586f9a4e4091e67 (patch)
tree18412e688242bc47486b123acdfdb5a3a2e43aa8
parent17693f46d6593e9b4e31d55e069b597d51b7de5b (diff)
schema: reduce upstream-commits sequences to mappings
Reduce the specific 'torvalds' and 'linux-next' sequences to mappings of their own. This allows the following syntax: upstream: - torvalds: 84df9525b0c27f3ebc2ebb1864fa62a97fdedb7d # Linux 4.19 - torvalds: 6d9666fb78526a7728cc4954ec1da4c2b416753d - next: e0868bcfd529997cf98da1dd14bab8cb8175eda7 Signed-off-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>
-rw-r--r--projects/linux/testtask.yaml10
-rw-r--r--projects/project.schema.yaml10
2 files changed, 8 insertions, 12 deletions
diff --git a/projects/linux/testtask.yaml b/projects/linux/testtask.yaml
index 959ed6a..96bf18d 100644
--- a/projects/linux/testtask.yaml
+++ b/projects/linux/testtask.yaml
@@ -10,12 +10,10 @@ bsp-commits:
- 6d9666fb78526a7728cc4954ec1da4c2b416753d
# arm64: dts: r8a77965: Support IPMMU(MMU mode) for IPMMU-VP0 and IPMMU-VC0
-upstream-commits:
- - torvalds:
- - 84df9525b0c27f3ebc2ebb1864fa62a97fdedb7d # Linux 4.19
- - 6d9666fb78526a7728cc4954ec1da4c2b416753d # arm64: Alternative: Multiline automagic commit title population
- - linux-next:
- - e0868bcfd529997cf98da1dd14bab8cb8175eda7 # <automagically filled in text here>
+upstream:
+ - torvalds: 84df9525b0c27f3ebc2ebb1864fa62a97fdedb7d # Linux 4.19
+ - torvalds: 6d9666fb78526a7728cc4954ec1da4c2b416753d # arm64: dts: r8a77965: Support IPMMU(MMU mode) for IPMMU-VP0 and IPMMU-VC0
+ - next: e0868bcfd529997cf98da1dd14bab8cb8175eda7 # <automagically filled in text here>
comments:
- Added a new thing
diff --git a/projects/project.schema.yaml b/projects/project.schema.yaml
index 31fde86..7130860 100644
--- a/projects/project.schema.yaml
+++ b/projects/project.schema.yaml
@@ -50,18 +50,16 @@ mapping:
sequence:
- include: gitcommit
- upstream-commits:
+ upstream:
desc: References to upstream commits
sequence:
- mapping:
torvalds:
desc: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=
- sequence:
- - include: gitcommit
- linux-next:
+ include: gitcommit
+ next:
desc: https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/?id=
- sequence:
- - include: gitcommit
+ include: gitcommit
parent:
desc: A reference to another topic key which must already exist