From 853fffe0a2a913827383abba8ce8b481aa40a41e Mon Sep 17 00:00:00 2001 From: Octokit Bot Date: Fri, 14 Oct 2022 19:06:49 +0000 Subject: [PATCH 1/8] build: cache --- .../webhook-events-and-payloads.html | 29 ++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/cache/api.github.com/webhook-events-and-payloads.html b/cache/api.github.com/webhook-events-and-payloads.html index 153780cfa..96c071d34 100644 --- a/cache/api.github.com/webhook-events-and-payloads.html +++ b/cache/api.github.com/webhook-events-and-payloads.html @@ -9099,6 +9099,11 @@

string The full ref of the merge group. + + merge_group[base_sha] + string + The SHA of the merge group's parent commit. + merge_group[base_ref] string @@ -9106,6 +9111,13 @@

The full ref of the branch the merge group will be merged into. + + merge_group[head_commit] + object + + An expanded representation of the head_sha commit. + + repository object @@ -9173,7 +9185,22 @@

"merge_group": { "head_sha": "2ffea6db159f6b6c47a24e778fb9ef40cf6b1c7d", "head_ref": "refs/heads/gh-readonly-queue/main/pr-104-929f8209d40f77f4abc622a499c93a83babdbe64", - "base_ref": "refs/heads/main" + "base_sha": "380387fbc80638b734a49e1be1c4dfec1c01b33c", + "base_ref": "refs/heads/main", + "head_commit": { + "id": "ec26c3e57ca3a959ca5aad62de7213c562f8c821", + "tree_id": "31b122c26a97cf9af023e9ddab94a82c6e77b0ea", + "message": "Merge pull request #2048 from octo-repo/update-readme\n\nUpdate README.md", + "timestamp": "2019-05-15T15:20:30Z", + "author": { + "name": "Codertocat", + "email": "21031067+Codertocat@users.noreply.github.com" + }, + "committer": { + "name": "Codertocat", + "email": "21031067+Codertocat@users.noreply.github.com" + } + } }, "repository": { "id": 17273051, From 65e8b500bd19b784734a77513d303824e170b8f6 Mon Sep 17 00:00:00 2001 From: Octokit Bot Date: Fri, 14 Oct 2022 19:06:53 +0000 Subject: [PATCH 2/8] WIP: api.github.com webhooks update --- payload-examples/api.github.com/index.json | 25 +++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/payload-examples/api.github.com/index.json b/payload-examples/api.github.com/index.json index fae6774b0..304631b29 100644 --- a/payload-examples/api.github.com/index.json +++ b/payload-examples/api.github.com/index.json @@ -29968,10 +29968,18 @@ "type": "string", "description": "The full ref of the merge group." }, + "merge_group[base_sha]": { + "type": "string", + "description": "The SHA of the merge group's parent commit." + }, "merge_group[base_ref]": { "type": "string", "description": "The full ref of the branch the merge group will be merged into." }, + "merge_group[head_commit]": { + "type": "object", + "description": "An expanded representation of the `head_sha` commit." + }, "repository": { "type": "object", "description": "The [`repository`](https://docs.github.com/en/rest/reference/repos#get-a-repository) where the event occurred." @@ -29995,7 +30003,22 @@ "merge_group": { "head_sha": "2ffea6db159f6b6c47a24e778fb9ef40cf6b1c7d", "head_ref": "refs/heads/gh-readonly-queue/main/pr-104-929f8209d40f77f4abc622a499c93a83babdbe64", - "base_ref": "refs/heads/main" + "base_sha": "380387fbc80638b734a49e1be1c4dfec1c01b33c", + "base_ref": "refs/heads/main", + "head_commit": { + "id": "ec26c3e57ca3a959ca5aad62de7213c562f8c821", + "tree_id": "31b122c26a97cf9af023e9ddab94a82c6e77b0ea", + "message": "Merge pull request #2048 from octo-repo/update-readme\n\nUpdate README.md", + "timestamp": "2019-05-15T15:20:30Z", + "author": { + "name": "Codertocat", + "email": "21031067+Codertocat@users.noreply.github.com" + }, + "committer": { + "name": "Codertocat", + "email": "21031067+Codertocat@users.noreply.github.com" + } + } }, "repository": { "id": 17273051, From be4ac8726e51cb2c88999d6a09ea9501add4eb18 Mon Sep 17 00:00:00 2001 From: wolfy1339 Date: Fri, 14 Oct 2022 20:33:42 -0400 Subject: [PATCH 3/8] feat: add new properties to `merge_group` event --- payload-examples/api.github.com/index.json | 17 +++++++- .../merge_group/checks_requested.payload.json | 17 +++++++- .../merge_group/checks_requested.schema.json | 43 ++++++++++++++++++- payload-types/schema.d.ts | 21 +++++++++ 4 files changed, 95 insertions(+), 3 deletions(-) diff --git a/payload-examples/api.github.com/index.json b/payload-examples/api.github.com/index.json index 304631b29..0ca2c182f 100644 --- a/payload-examples/api.github.com/index.json +++ b/payload-examples/api.github.com/index.json @@ -30158,7 +30158,22 @@ "merge_group": { "head_sha": "2ffea6db159f6b6c47a24e778fb9ef40cf6b1c7d", "head_ref": "refs/heads/gh-readonly-queue/main/pr-104-929f8209d40f77f4abc622a499c93a83babdbe64", - "base_ref": "refs/heads/main" + "base_sha": "380387fbc80638b734a49e1be1c4dfec1c01b33c", + "base_ref": "refs/heads/main", + "head_commit": { + "id": "ec26c3e57ca3a959ca5aad62de7213c562f8c821", + "tree_id": "31b122c26a97cf9af023e9ddab94a82c6e77b0ea", + "message": "Merge pull request #2048 from octo-repo/update-readme\n\nUpdate README.md", + "timestamp": "2019-05-15T15:20:30Z", + "author": { + "name": "Codertocat", + "email": "21031067+Codertocat@users.noreply.github.com" + }, + "committer": { + "name": "Codertocat", + "email": "21031067+Codertocat@users.noreply.github.com" + } + } }, "repository": { "id": 17273051, diff --git a/payload-examples/api.github.com/merge_group/checks_requested.payload.json b/payload-examples/api.github.com/merge_group/checks_requested.payload.json index c6f980517..15a5e744c 100644 --- a/payload-examples/api.github.com/merge_group/checks_requested.payload.json +++ b/payload-examples/api.github.com/merge_group/checks_requested.payload.json @@ -3,7 +3,22 @@ "merge_group": { "head_sha": "2ffea6db159f6b6c47a24e778fb9ef40cf6b1c7d", "head_ref": "refs/heads/gh-readonly-queue/main/pr-104-929f8209d40f77f4abc622a499c93a83babdbe64", - "base_ref": "refs/heads/main" + "base_sha": "380387fbc80638b734a49e1be1c4dfec1c01b33c", + "base_ref": "refs/heads/main", + "head_commit": { + "id": "ec26c3e57ca3a959ca5aad62de7213c562f8c821", + "tree_id": "31b122c26a97cf9af023e9ddab94a82c6e77b0ea", + "message": "Merge pull request #2048 from octo-repo/update-readme\n\nUpdate README.md", + "timestamp": "2019-05-15T15:20:30Z", + "author": { + "name": "Codertocat", + "email": "21031067+Codertocat@users.noreply.github.com" + }, + "committer": { + "name": "Codertocat", + "email": "21031067+Codertocat@users.noreply.github.com" + } + } }, "repository": { "id": 17273051, diff --git a/payload-schemas/api.github.com/merge_group/checks_requested.schema.json b/payload-schemas/api.github.com/merge_group/checks_requested.schema.json index 04aefad97..ccf42914f 100644 --- a/payload-schemas/api.github.com/merge_group/checks_requested.schema.json +++ b/payload-schemas/api.github.com/merge_group/checks_requested.schema.json @@ -8,7 +8,7 @@ "merge_group": { "type": "object", "description": "The merge group.", - "required": ["head_sha", "head_ref", "base_ref"], + "required": ["head_sha", "head_ref", "base_ref", "base_sha", "head_commit"], "properties": { "head_sha": { "type": "string", @@ -21,6 +21,47 @@ "base_ref": { "type": "string", "description": "The full ref of the branch the merge group will be merged into." + }, + "base_sha": { + "type": "string", + "description": "The SHA of the merge group's parent commit." + }, + "head_commit": { + "type": "object", + "description": "An expanded representation of the `head_sha` commit.", + "required": [ + "id", + "tree_id", + "message", + "timestamp", + "author", + "committer" + ], + "properties": { + "id": { "type": "string" }, + "tree_id": { "type": "string" }, + "message": { "type": "string" }, + "timestamp": { "type": "string", "format": "date-time" }, + "author": { + "type": "object", + "required": ["name", "email"], + "properties": { + "name": { "type": "string" }, + "email": { "type": "string" } + }, + "additionalProperties": false + }, + "committer": { + "type": "object", + "required": ["name", "email"], + "properties": { + "name": { "type": "string" }, + "email": { "type": "string" } + }, + "additionalProperties": false + } + }, + "additionalProperties": false } }, "additionalProperties": false diff --git a/payload-types/schema.d.ts b/payload-types/schema.d.ts index cb9f9c6c2..93291e295 100644 --- a/payload-types/schema.d.ts +++ b/payload-types/schema.d.ts @@ -4339,6 +4339,27 @@ export interface MergeGroupChecksRequestedEvent { * The full ref of the branch the merge group will be merged into. */ base_ref: string; + /** + * The SHA of the merge group's parent commit. + */ + base_sha: string; + /** + * An expanded representation of the `head_sha` commit. + */ + head_commit: { + id: string; + tree_id: string; + message: string; + timestamp: string; + author: { + name: string; + email: string; + }; + committer: { + name: string; + email: string; + }; + }; }; repository: Repository; sender: User; From 9e3bf23afe2b52c3904b6bd4147abff2070464fe Mon Sep 17 00:00:00 2001 From: wolfy1339 Date: Fri, 14 Oct 2022 20:44:46 -0400 Subject: [PATCH 4/8] style: format with prettier --- .../merge_group/checks_requested.schema.json | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/payload-schemas/api.github.com/merge_group/checks_requested.schema.json b/payload-schemas/api.github.com/merge_group/checks_requested.schema.json index ccf42914f..46aff8397 100644 --- a/payload-schemas/api.github.com/merge_group/checks_requested.schema.json +++ b/payload-schemas/api.github.com/merge_group/checks_requested.schema.json @@ -8,7 +8,13 @@ "merge_group": { "type": "object", "description": "The merge group.", - "required": ["head_sha", "head_ref", "base_ref", "base_sha", "head_commit"], + "required": [ + "head_sha", + "head_ref", + "base_ref", + "base_sha", + "head_commit" + ], "properties": { "head_sha": { "type": "string", From 1fe9233b794d39958c73f53e04e25b266f3957a2 Mon Sep 17 00:00:00 2001 From: Octokit Bot Date: Mon, 17 Oct 2022 19:14:49 +0000 Subject: [PATCH 5/8] build: cache --- cache/ghes-32/webhook-events-and-payloads.html | 2 +- cache/ghes-33/webhook-events-and-payloads.html | 2 +- cache/ghes-34/webhook-events-and-payloads.html | 2 +- cache/ghes-35/webhook-events-and-payloads.html | 2 +- cache/github.ae/webhook-events-and-payloads.html | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cache/ghes-32/webhook-events-and-payloads.html b/cache/ghes-32/webhook-events-and-payloads.html index 517fdab34..dcd612d57 100644 --- a/cache/ghes-32/webhook-events-and-payloads.html +++ b/cache/ghes-32/webhook-events-and-payloads.html @@ -735,7 +735,7 @@

> { > "action": "opened", > "issue": { -> "url": "http(s)://[hostname]/api/v3/repos/octocat/Hello-World/issues/1347", +> "url": "http(s)://HOSTNAME/api/v3/repos/octocat/Hello-World/issues/1347", > "number": 1347, > ... > }, diff --git a/cache/ghes-33/webhook-events-and-payloads.html b/cache/ghes-33/webhook-events-and-payloads.html index dbd781241..984744ebf 100644 --- a/cache/ghes-33/webhook-events-and-payloads.html +++ b/cache/ghes-33/webhook-events-and-payloads.html @@ -744,7 +744,7 @@

> { > "action": "opened", > "issue": { -> "url": "http(s)://[hostname]/api/v3/repos/octocat/Hello-World/issues/1347", +> "url": "http(s)://HOSTNAME/api/v3/repos/octocat/Hello-World/issues/1347", > "number": 1347, > ... > }, diff --git a/cache/ghes-34/webhook-events-and-payloads.html b/cache/ghes-34/webhook-events-and-payloads.html index cf9a29906..278b8abc7 100644 --- a/cache/ghes-34/webhook-events-and-payloads.html +++ b/cache/ghes-34/webhook-events-and-payloads.html @@ -753,7 +753,7 @@

> { > "action": "opened", > "issue": { -> "url": "http(s)://[hostname]/api/v3/repos/octocat/Hello-World/issues/1347", +> "url": "http(s)://HOSTNAME/api/v3/repos/octocat/Hello-World/issues/1347", > "number": 1347, > ... > }, diff --git a/cache/ghes-35/webhook-events-and-payloads.html b/cache/ghes-35/webhook-events-and-payloads.html index 4e76dbcaf..560918111 100644 --- a/cache/ghes-35/webhook-events-and-payloads.html +++ b/cache/ghes-35/webhook-events-and-payloads.html @@ -762,7 +762,7 @@

> { > "action": "opened", > "issue": { -> "url": "http(s)://[hostname]/api/v3/repos/octocat/Hello-World/issues/1347", +> "url": "http(s)://HOSTNAME/api/v3/repos/octocat/Hello-World/issues/1347", > "number": 1347, > ... > }, diff --git a/cache/github.ae/webhook-events-and-payloads.html b/cache/github.ae/webhook-events-and-payloads.html index a23ebd646..fecb06cce 100644 --- a/cache/github.ae/webhook-events-and-payloads.html +++ b/cache/github.ae/webhook-events-and-payloads.html @@ -665,7 +665,7 @@

> { > "action": "opened", > "issue": { -> "url": "https://[hostname]/api/v3/repos/octocat/Hello-World/issues/1347", +> "url": "https://HOSTNAME/api/v3/repos/octocat/Hello-World/issues/1347", > "number": 1347, > ... > }, From 5aa2b264663bb067bbd3d8124fe2bec923566f0c Mon Sep 17 00:00:00 2001 From: Octokit Bot Date: Tue, 18 Oct 2022 22:05:25 +0000 Subject: [PATCH 6/8] build: cache --- cache/api.github.com/webhook-events-and-payloads.html | 2 +- cache/ghes-32/webhook-events-and-payloads.html | 2 +- cache/ghes-33/webhook-events-and-payloads.html | 2 +- cache/ghes-34/webhook-events-and-payloads.html | 2 +- cache/ghes-35/webhook-events-and-payloads.html | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cache/api.github.com/webhook-events-and-payloads.html b/cache/api.github.com/webhook-events-and-payloads.html index 96c071d34..8c17bf1f0 100644 --- a/cache/api.github.com/webhook-events-and-payloads.html +++ b/cache/api.github.com/webhook-events-and-payloads.html @@ -19929,7 +19929,7 @@

ref string - The branch ref from which the workflow was run. + The branch or tag from which the workflow was run. repository diff --git a/cache/ghes-32/webhook-events-and-payloads.html b/cache/ghes-32/webhook-events-and-payloads.html index dcd612d57..0d6c53b09 100644 --- a/cache/ghes-32/webhook-events-and-payloads.html +++ b/cache/ghes-32/webhook-events-and-payloads.html @@ -17913,7 +17913,7 @@

ref string - The branch ref from which the workflow was run. + The branch or tag from which the workflow was run. repository diff --git a/cache/ghes-33/webhook-events-and-payloads.html b/cache/ghes-33/webhook-events-and-payloads.html index 984744ebf..3ef5cdfd3 100644 --- a/cache/ghes-33/webhook-events-and-payloads.html +++ b/cache/ghes-33/webhook-events-and-payloads.html @@ -17944,7 +17944,7 @@

ref string - The branch ref from which the workflow was run. + The branch or tag from which the workflow was run. repository diff --git a/cache/ghes-34/webhook-events-and-payloads.html b/cache/ghes-34/webhook-events-and-payloads.html index 278b8abc7..6e2acc0cb 100644 --- a/cache/ghes-34/webhook-events-and-payloads.html +++ b/cache/ghes-34/webhook-events-and-payloads.html @@ -18376,7 +18376,7 @@

ref string - The branch ref from which the workflow was run. + The branch or tag from which the workflow was run. repository diff --git a/cache/ghes-35/webhook-events-and-payloads.html b/cache/ghes-35/webhook-events-and-payloads.html index 560918111..dbd19f095 100644 --- a/cache/ghes-35/webhook-events-and-payloads.html +++ b/cache/ghes-35/webhook-events-and-payloads.html @@ -18693,7 +18693,7 @@

ref string - The branch ref from which the workflow was run. + The branch or tag from which the workflow was run. repository From d7002b1df0473c5c09305f460c523433c5750b11 Mon Sep 17 00:00:00 2001 From: wolfy1339 Date: Fri, 21 Oct 2022 18:57:23 -0400 Subject: [PATCH 7/8] Empty commit to trigger tests From 58838c4c860851d6ecd501ce5826c442c0a4746f Mon Sep 17 00:00:00 2001 From: wolfy1339 Date: Fri, 21 Oct 2022 19:00:41 -0400 Subject: [PATCH 8/8] build: generate index.json --- payload-examples/api.github.com/index.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/payload-examples/api.github.com/index.json b/payload-examples/api.github.com/index.json index 0ca2c182f..e5fd44bef 100644 --- a/payload-examples/api.github.com/index.json +++ b/payload-examples/api.github.com/index.json @@ -68825,7 +68825,7 @@ }, "ref": { "type": "string", - "description": "The branch ref from which the workflow was run." + "description": "The branch or tag from which the workflow was run." }, "repository": { "type": "object",