From bf970528551d8648504a6a3864d5af7d256c9202 Mon Sep 17 00:00:00 2001 From: Liela Rotschy Date: Wed, 19 Apr 2023 12:29:38 -0600 Subject: [PATCH 1/4] Add branches-ignore to merge group schema --- workflow-parser/src/workflow-v1.0.json | 3 ++- workflow-parser/testdata/reader/events-mapping-all.yml | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/workflow-parser/src/workflow-v1.0.json b/workflow-parser/src/workflow-v1.0.json index 4587263..f990beb 100644 --- a/workflow-parser/src/workflow-v1.0.json +++ b/workflow-parser/src/workflow-v1.0.json @@ -577,7 +577,8 @@ "mapping": { "properties": { "types": "merge-group-activity", - "branches": "event-branches" + "branches": "event-branches", + "branches-ignore": "event-branches-ignore" } } }, diff --git a/workflow-parser/testdata/reader/events-mapping-all.yml b/workflow-parser/testdata/reader/events-mapping-all.yml index 900a1f9..cea7f8e 100644 --- a/workflow-parser/testdata/reader/events-mapping-all.yml +++ b/workflow-parser/testdata/reader/events-mapping-all.yml @@ -77,6 +77,8 @@ on: - main types: - checks_requested + branches_ignore: + - develop milestone: types: - created @@ -323,6 +325,9 @@ jobs: ], "types": [ "checks_requested" + ], + "branches_ignore": [ + "develop" ] }, "milestone": { From 317c4fcd63980089c400dbf5100997956775763d Mon Sep 17 00:00:00 2001 From: Liela Rotschy Date: Wed, 19 Apr 2023 12:58:00 -0600 Subject: [PATCH 2/4] Fix hyphen --- workflow-parser/testdata/reader/events-mapping-all.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/workflow-parser/testdata/reader/events-mapping-all.yml b/workflow-parser/testdata/reader/events-mapping-all.yml index cea7f8e..7876796 100644 --- a/workflow-parser/testdata/reader/events-mapping-all.yml +++ b/workflow-parser/testdata/reader/events-mapping-all.yml @@ -77,7 +77,7 @@ on: - main types: - checks_requested - branches_ignore: + branches-ignore: - develop milestone: types: @@ -326,7 +326,7 @@ jobs: "types": [ "checks_requested" ], - "branches_ignore": [ + "branches-ignore": [ "develop" ] }, From 48ad5e5251a9c8ae42ab702215cde54b52da5e41 Mon Sep 17 00:00:00 2001 From: Liela Rotschy Date: Wed, 19 Apr 2023 13:11:39 -0600 Subject: [PATCH 3/4] Fix indentation --- workflow-parser/testdata/reader/events-mapping-all.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/workflow-parser/testdata/reader/events-mapping-all.yml b/workflow-parser/testdata/reader/events-mapping-all.yml index 7876796..2b55ad7 100644 --- a/workflow-parser/testdata/reader/events-mapping-all.yml +++ b/workflow-parser/testdata/reader/events-mapping-all.yml @@ -73,8 +73,8 @@ on: - deleted merge_group: branches: - - master - - main + - master + - main types: - checks_requested branches-ignore: From 3904c64796888c6a90605efde8050e2b8572c24a Mon Sep 17 00:00:00 2001 From: Liela Rotschy Date: Wed, 19 Apr 2023 13:15:08 -0600 Subject: [PATCH 4/4] Alphabetize --- workflow-parser/testdata/reader/events-mapping-all.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/workflow-parser/testdata/reader/events-mapping-all.yml b/workflow-parser/testdata/reader/events-mapping-all.yml index 2b55ad7..94b26ef 100644 --- a/workflow-parser/testdata/reader/events-mapping-all.yml +++ b/workflow-parser/testdata/reader/events-mapping-all.yml @@ -75,10 +75,10 @@ on: branches: - master - main - types: - - checks_requested branches-ignore: - develop + types: + - checks_requested milestone: types: - created @@ -323,11 +323,11 @@ jobs: "master", "main" ], - "types": [ - "checks_requested" - ], "branches-ignore": [ "develop" + ], + "types": [ + "checks_requested" ] }, "milestone": {