Skip to content

Commit

Permalink
Fix GitHub organization dependency, now works for user webhooks too (#…
Browse files Browse the repository at this point in the history 
…201)
  • Loading branch information
@eXistenZNL
eXistenZNL authored Nov 5, 2023
1 parent aa1f43f commit 572abf9
Show file tree
Hide file tree
Showing 71 changed files with 6,381 additions and 121 deletions.
4 changes: 2 additions & 2 deletions backend/parser/github/pull-request.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ class GitHubPullRequestParser {
if (!status) {
status = {
id,
project: `${pullRequest.organization.login} / ${pullRequest.repository.name}`,
project: `${pullRequest.repository.owner.login} / ${pullRequest.repository.name}`,
state: 'info',
source: 'github',
time: new Date().toUTCString(),
Expand All @@ -23,7 +23,7 @@ class GitHubPullRequestParser {
username: pullRequest.sender.login,
userUrl: pullRequest.sender.html_url,
userImage: pullRequest.sender.avatar_url,
projectImage: pullRequest.organization.avatar_url,
projectImage: pullRequest.repository.owner.avatar_url,
sourceUrl: pullRequest.repository.html_url,
mergeTitle: pullRequest.pull_request.title,
mergeUrl: pullRequest.pull_request.html_url,
Expand Down
4 changes: 2 additions & 2 deletions backend/parser/github/push.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ class GitHubPushParser {
if (!status) {
status = {
id,
project: `${push.organization.login} / ${push.repository.name}`,
project: `${push.repository.owner.name} / ${push.repository.name}`,
state: 'info',
source: 'github',
time: new Date().toUTCString(),
Expand All @@ -34,7 +34,7 @@ class GitHubPushParser {
username: push.sender.login,
userUrl: push.sender.html_url,
userImage: push.sender.avatar_url,
projectImage: push.organization.avatar_url,
projectImage: push.repository.owner.avatar_url,
sourceUrl: push.repository.html_url,
time: new Date().toUTCString(),
};
Expand Down
4 changes: 2 additions & 2 deletions backend/parser/github/run.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ class GitHubRunParser {
if (!status) {
status = {
id,
project: `${run.organization.login} / ${run.repository.name}`,
project: `${run.repository.owner.login} / ${run.repository.name}`,
state: 'info',
source: 'github',
branch: run.workflow_run.head_branch,
Expand Down Expand Up @@ -55,7 +55,7 @@ class GitHubRunParser {
username: run.sender.login,
userUrl: run.sender.html_url,
userImage: run.sender.avatar_url,
projectImage: run.organization.avatar_url,
projectImage: run.repository.owner.avatar_url,
sourceUrl: run.repository.html_url,
processes,
time: new Date().toUTCString(),
Expand Down
12 changes: 2 additions & 10 deletions cypress/fixtures/github/push/1.json → .../fixtures/github/push/organisation/1.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -201,11 +201,7 @@
},
"added": [],
"removed": [],
"modified": [
".editorconfig",
"docs/run/locally.md",
"docs/run/raspberry-arm.md"
]
"modified": [".editorconfig", "docs/run/locally.md", "docs/run/raspberry-arm.md"]
}
],
"head_commit": {
Expand All @@ -227,11 +223,7 @@
},
"added": [],
"removed": [],
"modified": [
".editorconfig",
"docs/run/locally.md",
"docs/run/raspberry-arm.md"
]
"modified": [".editorconfig", "docs/run/locally.md", "docs/run/raspberry-arm.md"]
}
}
}
4 changes: 1 addition & 3 deletions cypress/fixtures/github/push/10.json → ...fixtures/github/push/organisation/10.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,7 @@
}
],
"check_run_url": "https://api.github.com/repos/FuturePortal/CIMonitor/check-runs/18367967224",
"labels": [
"ubuntu-22.04"
],
"labels": ["ubuntu-22.04"],
"runner_id": 3,
"runner_name": "GitHub Actions 3",
"runner_group_id": 2,
Expand Down
0 cypress/fixtures/github/push/11.json → ...fixtures/github/push/organisation/11.json
View file
File renamed without changes.
4 changes: 1 addition & 3 deletions cypress/fixtures/github/push/12.json → ...fixtures/github/push/organisation/12.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,7 @@
}
],
"check_run_url": "https://api.github.com/repos/FuturePortal/CIMonitor/check-runs/18367967136",
"labels": [
"ubuntu-22.04"
],
"labels": ["ubuntu-22.04"],
"runner_id": 2,
"runner_name": "GitHub Actions 2",
"runner_group_id": 2,
Expand Down
4 changes: 1 addition & 3 deletions cypress/fixtures/github/push/13.json → ...fixtures/github/push/organisation/13.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,9 +91,7 @@
}
],
"check_run_url": "https://api.github.com/repos/FuturePortal/CIMonitor/check-runs/18367967326",
"labels": [
"ubuntu-22.04"
],
"labels": ["ubuntu-22.04"],
"runner_id": 4,
"runner_name": "GitHub Actions 4",
"runner_group_id": 2,
Expand Down
0 cypress/fixtures/github/push/14.json → ...fixtures/github/push/organisation/14.json
View file
File renamed without changes.
4 changes: 1 addition & 3 deletions cypress/fixtures/github/push/15.json → ...fixtures/github/push/organisation/15.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,9 +91,7 @@
}
],
"check_run_url": "https://api.github.com/repos/FuturePortal/CIMonitor/check-runs/18367967224",
"labels": [
"ubuntu-22.04"
],
"labels": ["ubuntu-22.04"],
"runner_id": 3,
"runner_name": "GitHub Actions 3",
"runner_group_id": 2,
Expand Down
0 cypress/fixtures/github/push/16.json → ...fixtures/github/push/organisation/16.json
View file
File renamed without changes.
4 changes: 1 addition & 3 deletions cypress/fixtures/github/push/17.json → ...fixtures/github/push/organisation/17.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,9 +91,7 @@
}
],
"check_run_url": "https://api.github.com/repos/FuturePortal/CIMonitor/check-runs/18367967136",
"labels": [
"ubuntu-22.04"
],
"labels": ["ubuntu-22.04"],
"runner_id": 2,
"runner_name": "GitHub Actions 2",
"runner_group_id": 2,
Expand Down
0 cypress/fixtures/github/push/18.json → ...fixtures/github/push/organisation/18.json
View file
File renamed without changes.
0 cypress/fixtures/github/push/19.json → ...fixtures/github/push/organisation/19.json
View file
File renamed without changes.
0 cypress/fixtures/github/push/2.json → .../fixtures/github/push/organisation/2.json
View file
File renamed without changes.
4 changes: 1 addition & 3 deletions cypress/fixtures/github/push/20.json → ...fixtures/github/push/organisation/20.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,7 @@
"name": "Build / Module client / Build & Tag",
"steps": [],
"check_run_url": "https://api.github.com/repos/FuturePortal/CIMonitor/check-runs/18367979549",
"labels": [
"ubuntu-22.04"
],
"labels": ["ubuntu-22.04"],
"runner_id": null,
"runner_name": null,
"runner_group_id": null,
Expand Down
4 changes: 1 addition & 3 deletions cypress/fixtures/github/push/21.json → ...fixtures/github/push/organisation/21.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,7 @@
"name": "Build / Module client ARM / Build & Tag",
"steps": [],
"check_run_url": "https://api.github.com/repos/FuturePortal/CIMonitor/check-runs/18367979605",
"labels": [
"ubuntu-22.04"
],
"labels": ["ubuntu-22.04"],
"runner_id": null,
"runner_name": null,
"runner_group_id": null,
Expand Down
0 cypress/fixtures/github/push/22.json → ...fixtures/github/push/organisation/22.json
View file
File renamed without changes.
0 cypress/fixtures/github/push/23.json → ...fixtures/github/push/organisation/23.json
View file
File renamed without changes.
4 changes: 1 addition & 3 deletions cypress/fixtures/github/push/24.json → ...fixtures/github/push/organisation/24.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,7 @@
"name": "Build / Server / Build & Tag",
"steps": [],
"check_run_url": "https://api.github.com/repos/FuturePortal/CIMonitor/check-runs/18367979664",
"labels": [
"ubuntu-22.04"
],
"labels": ["ubuntu-22.04"],
"runner_id": null,
"runner_name": null,
"runner_group_id": null,
Expand Down
4 changes: 1 addition & 3 deletions cypress/fixtures/github/push/25.json → ...fixtures/github/push/organisation/25.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,7 @@
"name": "Build / Server ARM / Build & Tag",
"steps": [],
"check_run_url": "https://api.github.com/repos/FuturePortal/CIMonitor/check-runs/18367979711",
"labels": [
"ubuntu-22.04"
],
"labels": ["ubuntu-22.04"],
"runner_id": null,
"runner_name": null,
"runner_group_id": null,
Expand Down
0 cypress/fixtures/github/push/26.json → ...fixtures/github/push/organisation/26.json
View file
File renamed without changes.
4 changes: 1 addition & 3 deletions cypress/fixtures/github/push/27.json → ...fixtures/github/push/organisation/27.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -123,9 +123,7 @@
}
],
"check_run_url": "https://api.github.com/repos/FuturePortal/CIMonitor/check-runs/18367979549",
"labels": [
"ubuntu-22.04"
],
"labels": ["ubuntu-22.04"],
"runner_id": 3,
"runner_name": "GitHub Actions 3",
"runner_group_id": 2,
Expand Down
4 changes: 1 addition & 3 deletions cypress/fixtures/github/push/28.json → ...fixtures/github/push/organisation/28.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -123,9 +123,7 @@
}
],
"check_run_url": "https://api.github.com/repos/FuturePortal/CIMonitor/check-runs/18367979711",
"labels": [
"ubuntu-22.04"
],
"labels": ["ubuntu-22.04"],
"runner_id": 5,
"runner_name": "GitHub Actions 5",
"runner_group_id": 2,
Expand Down
4 changes: 1 addition & 3 deletions cypress/fixtures/github/push/29.json → ...fixtures/github/push/organisation/29.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -123,9 +123,7 @@
}
],
"check_run_url": "https://api.github.com/repos/FuturePortal/CIMonitor/check-runs/18367979664",
"labels": [
"ubuntu-22.04"
],
"labels": ["ubuntu-22.04"],
"runner_id": 4,
"runner_name": "GitHub Actions 4",
"runner_group_id": 2,
Expand Down
4 changes: 1 addition & 3 deletions cypress/fixtures/github/push/3.json → .../fixtures/github/push/organisation/3.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,7 @@
"name": "Test / ESLint",
"steps": [],
"check_run_url": "https://api.github.com/repos/FuturePortal/CIMonitor/check-runs/18367967136",
"labels": [
"ubuntu-22.04"
],
"labels": ["ubuntu-22.04"],
"runner_id": null,
"runner_name": null,
"runner_group_id": null,
Expand Down
0 cypress/fixtures/github/push/30.json → ...fixtures/github/push/organisation/30.json
View file
File renamed without changes.
4 changes: 1 addition & 3 deletions cypress/fixtures/github/push/31.json → ...fixtures/github/push/organisation/31.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -123,9 +123,7 @@
}
],
"check_run_url": "https://api.github.com/repos/FuturePortal/CIMonitor/check-runs/18367979605",
"labels": [
"ubuntu-22.04"
],
"labels": ["ubuntu-22.04"],
"runner_id": 2,
"runner_name": "GitHub Actions 2",
"runner_group_id": 2,
Expand Down
0 cypress/fixtures/github/push/32.json → ...fixtures/github/push/organisation/32.json
View file
File renamed without changes.
4 changes: 1 addition & 3 deletions cypress/fixtures/github/push/33.json → ...fixtures/github/push/organisation/33.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -147,9 +147,7 @@
}
],
"check_run_url": "https://api.github.com/repos/FuturePortal/CIMonitor/check-runs/18367979549",
"labels": [
"ubuntu-22.04"
],
"labels": ["ubuntu-22.04"],
"runner_id": 3,
"runner_name": "GitHub Actions 3",
"runner_group_id": 2,
Expand Down
4 changes: 1 addition & 3 deletions cypress/fixtures/github/push/34.json → ...fixtures/github/push/organisation/34.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -147,9 +147,7 @@
}
],
"check_run_url": "https://api.github.com/repos/FuturePortal/CIMonitor/check-runs/18367979664",
"labels": [
"ubuntu-22.04"
],
"labels": ["ubuntu-22.04"],
"runner_id": 4,
"runner_name": "GitHub Actions 4",
"runner_group_id": 2,
Expand Down
0 cypress/fixtures/github/push/35.json → ...fixtures/github/push/organisation/35.json
View file
File renamed without changes.
0 cypress/fixtures/github/push/36.json → ...fixtures/github/push/organisation/36.json
View file
File renamed without changes.
4 changes: 1 addition & 3 deletions cypress/fixtures/github/push/37.json → ...fixtures/github/push/organisation/37.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -147,9 +147,7 @@
}
],
"check_run_url": "https://api.github.com/repos/FuturePortal/CIMonitor/check-runs/18367979711",
"labels": [
"ubuntu-22.04"
],
"labels": ["ubuntu-22.04"],
"runner_id": 5,
"runner_name": "GitHub Actions 5",
"runner_group_id": 2,
Expand Down
0 cypress/fixtures/github/push/38.json → ...fixtures/github/push/organisation/38.json
View file
File renamed without changes.
0 cypress/fixtures/github/push/39.json → ...fixtures/github/push/organisation/39.json
View file
File renamed without changes.
0 cypress/fixtures/github/push/4.json → .../fixtures/github/push/organisation/4.json
View file
File renamed without changes.
4 changes: 1 addition & 3 deletions cypress/fixtures/github/push/40.json → ...fixtures/github/push/organisation/40.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -147,9 +147,7 @@
}
],
"check_run_url": "https://api.github.com/repos/FuturePortal/CIMonitor/check-runs/18367979605",
"labels": [
"ubuntu-22.04"
],
"labels": ["ubuntu-22.04"],
"runner_id": 2,
"runner_name": "GitHub Actions 2",
"runner_group_id": 2,
Expand Down
0 cypress/fixtures/github/push/41.json → ...fixtures/github/push/organisation/41.json
View file
File renamed without changes.
0 cypress/fixtures/github/push/5.json → .../fixtures/github/push/organisation/5.json
View file
File renamed without changes.
4 changes: 1 addition & 3 deletions cypress/fixtures/github/push/6.json → .../fixtures/github/push/organisation/6.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,7 @@
"name": "Test / Frontend typescript",
"steps": [],
"check_run_url": "https://api.github.com/repos/FuturePortal/CIMonitor/check-runs/18367967224",
"labels": [
"ubuntu-22.04"
],
"labels": ["ubuntu-22.04"],
"runner_id": null,
"runner_name": null,
"runner_group_id": null,
Expand Down
0 cypress/fixtures/github/push/7.json → .../fixtures/github/push/organisation/7.json
View file
File renamed without changes.
4 changes: 1 addition & 3 deletions cypress/fixtures/github/push/8.json → .../fixtures/github/push/organisation/8.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,7 @@
"name": "Test / Backend typescript",
"steps": [],
"check_run_url": "https://api.github.com/repos/FuturePortal/CIMonitor/check-runs/18367967326",
"labels": [
"ubuntu-22.04"
],
"labels": ["ubuntu-22.04"],
"runner_id": null,
"runner_name": null,
"runner_group_id": null,
Expand Down
4 changes: 1 addition & 3 deletions cypress/fixtures/github/push/9.json → .../fixtures/github/push/organisation/9.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,9 +83,7 @@
}
],
"check_run_url": "https://api.github.com/repos/FuturePortal/CIMonitor/check-runs/18367967326",
"labels": [
"ubuntu-22.04"
],
"labels": ["ubuntu-22.04"],
"runner_id": 4,
"runner_name": "GitHub Actions 4",
"runner_group_id": 2,
Expand Down
Loading

0 comments on commit 572abf9

Please sign in to comment.