Skip to content

Commit

Permalink
🐛 fix(config): change SKIPDELETE value to false (#487)
Browse files Browse the repository at this point in the history
🎨 chore(config): update semanticEmoji condition in config files
🎨 chore(contexts): update issue title in issue.json
The SKIPDELETE value in the config file was changed from true to false to enable the deletion of branches after a pull request is merged. The semanticEmoji condition in the config files was updated to use the semanticEmoji instead of semanticTitle. The issue title in the issue.json file was updated to use the bug emoji and the condition context.

📝 chore(pr.json): update pull request title
The pull request title was updated from "chore: test gitmoji" to "🐛 bug(website): Test 2". This change was made to better reflect the nature of the changes made in the pull request.

🔨 refactor(conventions.ts): improve code readability and add comments
This commit improves the readability of the code by adding comments and whitespace. The comments explain the purpose of each function and the code blocks.

Signed-off-by: Jonathan Stevens <[email protected]>
  • Loading branch information
TGTGamer authored Apr 16, 2023
1 parent 1e432b8 commit dd13ed7
Show file tree
Hide file tree
Showing 12 changed files with 260 additions and 137 deletions.
15 changes: 1 addition & 14 deletions .github/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -484,20 +484,7 @@
"condition": [
{
"requires": 1,
"contexts": [
"@resnovas/workflow-mastermind",
"@resnovas/release-mastermind",
"@resnovas/label-mastermind",
"@resnovas/variable-mastermind",
"@resnovas/convention-mastermind",
"condition",
"api",
"util",
"installer",
"deps",
"deps-dev"
],
"condition": "semanticTitle"
"condition": "semanticEmoji"
}
]
},
Expand Down
15 changes: 1 addition & 14 deletions .github/config/runners.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,20 +24,7 @@
"condition": [
{
"requires": 1,
"contexts": [
"@resnovas/workflow-mastermind",
"@resnovas/release-mastermind",
"@resnovas/label-mastermind",
"@resnovas/variable-mastermind",
"@resnovas/convention-mastermind",
"condition",
"api",
"util",
"installer",
"deps",
"deps-dev"
],
"condition": "semanticTitle"
"condition": "semanticEmoji"
}
]
},
Expand Down
15 changes: 1 addition & 14 deletions .github/config/runners/0.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,20 +23,7 @@
"condition": [
{
"requires": 1,
"contexts": [
"@resnovas/workflow-mastermind",
"@resnovas/release-mastermind",
"@resnovas/label-mastermind",
"@resnovas/variable-mastermind",
"@resnovas/convention-mastermind",
"condition",
"api",
"util",
"installer",
"deps",
"deps-dev"
],
"condition": "semanticTitle"
"condition": "semanticEmoji"
}
]
},
Expand Down
2 changes: 1 addition & 1 deletion contexts/config.sample.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"GITHUB_REPOSITORY_OWNER": "",
"GITHUB_REPOSITORY": "",
"FILL": true,
"SKIPDELETE": true,
"SKIPDELETE": false,
"SHOW_LOGS": true,
"GH_ACTION_LOCAL_TEST": true,
"github_context": "./context.json",
Expand Down
22 changes: 11 additions & 11 deletions contexts/issue.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"from": "<!-- @format -->\r\n\r\n<!-- Please use [context] in title to describe the package related to this issue.\r\nValid options are; Release, Label, Variable, Installer\r\ncontext example: bug(installer): {your title here}\r\n-->\r\n\r\n## Describe the bug\r\n\r\n<!-- A clear and concise description of what the bug is. -->\r\n\r\n### To Reproduce\r\n\r\n<!-- Steps to reproduce the behaviour:-->\r\n\r\n1. Go to '...'\r\n2. Click on '....'\r\n3. Scroll down to '....'\r\n4. See error\r\n\r\n### Expected behaviour\r\n\r\n<!-- A clear and concise description of what you expected to happen. -->\r\n\r\n### Screenshots\r\n\r\n### Console Logs\r\n\r\n<!-- Please [set the `ACTIONS_RUNNER_DEBUG` secret to `true` to enable debug logging](https://help.github.com/en/actions/configuring-and-managing-workflows/managing-a-workflow-run#enabling-debug-logging), rerun the labeler workflow, and paste the output below: -->\r\n\r\n```\r\ninsert debug output here\r\n```\r\n\r\n## Device Information\r\n\r\n<!-- Please delete all information not relivent-->\r\n\r\n- Version: [e.g. 22]\r\n- Platform: [e.g. macOS, Google Cloud, ubuntu 18.04]\r\n- Browser: [e.g. stock browser, safari]\r\n- Node Version: [e.g. v16.8.0]\r\n- Yarn Version: [e.g. v1.22.4]\r\n- Docker Version: [e.g. Docker version 19.03.12, build 48a66213fe]\r\n- Package(s): [e.g. @resnovas/release-manager]\r\n- URL: [e.g. https://console.smartcloud.gg/admin]\r\n\r\n## Additional context\r\n\r\n<!-- Add any other context about the problem here. -->\r\n\r\n## Bug Checklist\r\n\r\n<!-- Please be honest here; we don't mind if you haven't done all these steps; however, we need to know where has been tested and how extensively we need to test it ourselves.\r\n\r\nWe would appreciate it if you could maintain this section cleanly and clearly. If someone confirms your bug, add them to the \"Bug confirmed by\" section. Our bot will automatically detect if you have enough users confirmed to tag this bug as \"Bug - Confirmed\".\r\n-->\r\n\r\n- [ ] Have reproduced on my application version\r\n- [ ] Have reproduced on a clean installation\r\n- [ ] Have reproduced on a development build\r\n- [ ] Have included logs or screenshots\r\n- [ ] Have contacted support via the official website\r\n- [ ] Have asked the community for guidance\r\n- [ ] Have linked any related issues\r\n- [ ] Bug confirmed by <!--@yourusername & @friendsusername-->\r\n"
},
"title": {
"from": "bug(website): Test 2"
"from": "bug(condition): Test 4"
}
},
"issue": {
Expand All @@ -16,7 +16,7 @@
"author_association": "MEMBER",
"body": "<!-- @format -->\r\n\r\n<!-- Please use [context] in title to describe the package related to this issue.\r\nValid options are; Release, Label, Variable, Installer\r\ncontext example: bug(installer): {your title here}\r\n-->\r\n\r\n## Describe the bug\r\n\r\n<!-- A clear and concise description of what the bug is. -->\r\n\r\n### To Reproduce\r\n\r\n<!-- Steps to reproduce the behaviour:-->\r\n\r\n1. Go to '...'\r\n2. Click on '....'\r\n3. Scroll down to '....'\r\n4. See error\r\n\r\n### Expected behaviour\r\n\r\n<!-- A clear and concise description of what you expected to happen. -->\r\n\r\n### Screenshots\r\n\r\n### Console Logs\r\n\r\n<!-- Please [set the `ACTIONS_RUNNER_DEBUG` secret to `true` to enable debug logging](https://help.github.com/en/actions/configuring-and-managing-workflows/managing-a-workflow-run#enabling-debug-logging), rerun the labeler workflow, and paste the output below: -->\r\n\r\n```\r\ninsert debug output here\r\n```\r\n\r\n## Device Information\r\n\r\n<!-- Please delete all information not relivent-->\r\n\r\n- Version: [e.g. 22]\r\n- Platform: [e.g. macOS, Google Cloud, ubuntu 18.04]\r\n- Browser: [e.g. stock browser, safari]\r\n- Node Version: [e.g. v16.8.0]\r\n- Yarn Version: [e.g. v1.22.4]\r\n- Docker Version: [e.g. Docker version 19.03.12, build 48a66213fe]\r\n- Package(s): [e.g. @resnovas/release-manager]\r\n- URL: [e.g. https://console.smartcloud.gg/admin]\r\n\r\n## Additional context\r\n\r\n<!-- Add any other context about the problem here. -->\r\n\r\n## Bug Checklist\r\n\r\n<!-- Please be honest here; we don't mind if you haven't done all these steps; however, we need to know where has been tested and how extensively we need to test it ourselves.\r\n\r\nWe would appreciate it if you could maintain this section cleanly and clearly. If someone confirms your bug, add them to the \"Bug confirmed by\" section. Our bot will automatically detect if you have enough users confirmed to tag this bug as \"Bug - Confirmed\".\r\n-->\r\n\r\n- [ ] Have reproduced on my application version\r\n- [ ] Have reproduced on a clean installation\r\n- [ ] Have reproduced on a development build\r\n- [ ] Have included logs or screenshots\r\n- [ ] Have contacted support via the official website\r\n- [ ] Have asked the community for guidance\r\n- [ ] Have linked any related issues\r\n- [ ] Bug confirmed by <!--@yourusername & @friendsusername-->\r\n",
"closed_at": null,
"comments": 0,
"comments": 1,
"comments_url": "https://api.github.com/repos/Resnovas/smartcloud/issues/473/comments",
"created_at": "2023-04-13T19:47:00Z",
"events_url": "https://api.github.com/repos/Resnovas/smartcloud/issues/473/events",
Expand Down Expand Up @@ -45,8 +45,8 @@
"state": "open",
"state_reason": null,
"timeline_url": "https://api.github.com/repos/Resnovas/smartcloud/issues/473/timeline",
"title": "bug(condition): Test 3",
"updated_at": "2023-04-14T15:56:36Z",
"title": "🐛 bug(condition): Test 2",
"updated_at": "2023-04-16T18:59:09Z",
"url": "https://api.github.com/repos/Resnovas/smartcloud/issues/473",
"user": {
"avatar_url": "https://avatars.githubusercontent.com/u/11413796?v=4",
Expand Down Expand Up @@ -138,8 +138,8 @@
"name": "smartcloud",
"node_id": "MDEwOlJlcG9zaXRvcnkzMTU5MzkxMDM=",
"notifications_url": "https://api.github.com/repos/Resnovas/smartcloud/notifications{?since,all,participating}",
"open_issues": 12,
"open_issues_count": 12,
"open_issues": 13,
"open_issues_count": 13,
"owner": {
"avatar_url": "https://avatars.githubusercontent.com/u/62039749?v=4",
"events_url": "https://api.github.com/users/Resnovas/events{/privacy}",
Expand All @@ -162,9 +162,9 @@
},
"private": false,
"pulls_url": "https://api.github.com/repos/Resnovas/smartcloud/pulls{/number}",
"pushed_at": "2023-04-14T12:41:18Z",
"pushed_at": "2023-04-16T18:07:10Z",
"releases_url": "https://api.github.com/repos/Resnovas/smartcloud/releases{/id}",
"size": 116862,
"size": 114625,
"ssh_url": "[email protected]:Resnovas/smartcloud.git",
"stargazers_count": 7,
"stargazers_url": "https://api.github.com/repos/Resnovas/smartcloud/stargazers",
Expand Down Expand Up @@ -205,14 +205,14 @@
}
},
"eventName": "issues",
"sha": "cad28cab729f6e14f881c5df9a9a3737e10d5f8e",
"sha": "1e432b80e3370bb3634c432995a4c5b7f5681393",
"ref": "refs/heads/main",
"workflow": "Project Management",
"action": "__self",
"actor": "TGTGamer",
"job": "release-mastermind",
"runNumber": 16084,
"runId": 4701623747,
"runNumber": 16111,
"runId": 4714893743,
"apiUrl": "https://api.github.com",
"serverUrl": "https://github.com",
"graphqlUrl": "https://api.github.com/graphql"
Expand Down
89 changes: 47 additions & 42 deletions contexts/pr.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
{
"payload": {
"action": "opened",
"number": 480,
"action": "edited",
"changes": {
"title": {
"from": "chore: test gitmoji"
}
},
"number": 486,
"organization": {
"avatar_url": "https://avatars.githubusercontent.com/u/62039749?v=4",
"description": "",
Expand All @@ -19,28 +24,28 @@
"pull_request": {
"_links": {
"comments": {
"href": "https://api.github.com/repos/Resnovas/smartcloud/issues/480/comments"
"href": "https://api.github.com/repos/Resnovas/smartcloud/issues/486/comments"
},
"commits": {
"href": "https://api.github.com/repos/Resnovas/smartcloud/pulls/480/commits"
"href": "https://api.github.com/repos/Resnovas/smartcloud/pulls/486/commits"
},
"html": {
"href": "https://github.com/Resnovas/smartcloud/pull/480"
"href": "https://github.com/Resnovas/smartcloud/pull/486"
},
"issue": {
"href": "https://api.github.com/repos/Resnovas/smartcloud/issues/480"
"href": "https://api.github.com/repos/Resnovas/smartcloud/issues/486"
},
"review_comment": {
"href": "https://api.github.com/repos/Resnovas/smartcloud/pulls/comments{/number}"
},
"review_comments": {
"href": "https://api.github.com/repos/Resnovas/smartcloud/pulls/480/comments"
"href": "https://api.github.com/repos/Resnovas/smartcloud/pulls/486/comments"
},
"self": {
"href": "https://api.github.com/repos/Resnovas/smartcloud/pulls/480"
"href": "https://api.github.com/repos/Resnovas/smartcloud/pulls/486"
},
"statuses": {
"href": "https://api.github.com/repos/Resnovas/smartcloud/statuses/68d6a264e10f08ffada7cddc5990a7e74bee53a4"
"href": "https://api.github.com/repos/Resnovas/smartcloud/statuses/b3e9b86e5d615c8539dc3e99a0acfbb44cda7af6"
}
},
"active_lock_reason": null,
Expand Down Expand Up @@ -139,9 +144,9 @@
},
"private": false,
"pulls_url": "https://api.github.com/repos/Resnovas/smartcloud/pulls{/number}",
"pushed_at": "2023-04-14T15:58:38Z",
"pushed_at": "2023-04-16T18:07:10Z",
"releases_url": "https://api.github.com/repos/Resnovas/smartcloud/releases{/id}",
"size": 116862,
"size": 114625,
"squash_merge_commit_message": "COMMIT_MESSAGES",
"squash_merge_commit_title": "COMMIT_OR_PR_TITLE",
"ssh_url": "[email protected]:Resnovas/smartcloud.git",
Expand All @@ -163,7 +168,7 @@
"watchers_count": 7,
"web_commit_signoff_required": true
},
"sha": "cad28cab729f6e14f881c5df9a9a3737e10d5f8e",
"sha": "1e432b80e3370bb3634c432995a4c5b7f5681393",
"user": {
"avatar_url": "https://avatars.githubusercontent.com/u/62039749?v=4",
"events_url": "https://api.github.com/users/Resnovas/events{/privacy}",
Expand All @@ -188,17 +193,17 @@
"body": null,
"changed_files": 1,
"closed_at": null,
"comments": 0,
"comments_url": "https://api.github.com/repos/Resnovas/smartcloud/issues/480/comments",
"comments": 1,
"comments_url": "https://api.github.com/repos/Resnovas/smartcloud/issues/486/comments",
"commits": 1,
"commits_url": "https://api.github.com/repos/Resnovas/smartcloud/pulls/480/commits",
"created_at": "2023-04-14T15:58:38Z",
"commits_url": "https://api.github.com/repos/Resnovas/smartcloud/pulls/486/commits",
"created_at": "2023-04-16T18:07:10Z",
"deletions": 173,
"diff_url": "https://github.com/Resnovas/smartcloud/pull/480.diff",
"diff_url": "https://github.com/Resnovas/smartcloud/pull/486.diff",
"draft": false,
"head": {
"label": "Resnovas:TGTGamer-test-patch",
"ref": "TGTGamer-test-patch",
"label": "Resnovas:TGTGamer-patch-2",
"ref": "TGTGamer-patch-2",
"repo": {
"allow_auto_merge": true,
"allow_forking": true,
Expand Down Expand Up @@ -286,9 +291,9 @@
},
"private": false,
"pulls_url": "https://api.github.com/repos/Resnovas/smartcloud/pulls{/number}",
"pushed_at": "2023-04-14T15:58:38Z",
"pushed_at": "2023-04-16T18:07:10Z",
"releases_url": "https://api.github.com/repos/Resnovas/smartcloud/releases{/id}",
"size": 116862,
"size": 114625,
"squash_merge_commit_message": "COMMIT_MESSAGES",
"squash_merge_commit_title": "COMMIT_OR_PR_TITLE",
"ssh_url": "[email protected]:Resnovas/smartcloud.git",
Expand All @@ -310,7 +315,7 @@
"watchers_count": 7,
"web_commit_signoff_required": true
},
"sha": "68d6a264e10f08ffada7cddc5990a7e74bee53a4",
"sha": "b3e9b86e5d615c8539dc3e99a0acfbb44cda7af6",
"user": {
"avatar_url": "https://avatars.githubusercontent.com/u/62039749?v=4",
"events_url": "https://api.github.com/users/Resnovas/events{/privacy}",
Expand All @@ -332,33 +337,33 @@
"url": "https://api.github.com/users/Resnovas"
}
},
"html_url": "https://github.com/Resnovas/smartcloud/pull/480",
"id": 1314344166,
"issue_url": "https://api.github.com/repos/Resnovas/smartcloud/issues/480",
"html_url": "https://github.com/Resnovas/smartcloud/pull/486",
"id": 1315666463,
"issue_url": "https://api.github.com/repos/Resnovas/smartcloud/issues/486",
"labels": [],
"locked": false,
"maintainer_can_modify": false,
"merge_commit_sha": null,
"mergeable": null,
"mergeable_state": "unknown",
"merge_commit_sha": "e4592c5f565f84cd9ed725377a1bddb0f62732c1",
"mergeable": true,
"mergeable_state": "unstable",
"merged": false,
"merged_at": null,
"merged_by": null,
"milestone": null,
"node_id": "PR_kwDOEtTZH85OV0zm",
"number": 480,
"patch_url": "https://github.com/Resnovas/smartcloud/pull/480.patch",
"rebaseable": null,
"node_id": "PR_kwDOEtTZH85Oa3of",
"number": 486,
"patch_url": "https://github.com/Resnovas/smartcloud/pull/486.patch",
"rebaseable": true,
"requested_reviewers": [],
"requested_teams": [],
"review_comment_url": "https://api.github.com/repos/Resnovas/smartcloud/pulls/comments{/number}",
"review_comments": 0,
"review_comments_url": "https://api.github.com/repos/Resnovas/smartcloud/pulls/480/comments",
"review_comments_url": "https://api.github.com/repos/Resnovas/smartcloud/pulls/486/comments",
"state": "open",
"statuses_url": "https://api.github.com/repos/Resnovas/smartcloud/statuses/68d6a264e10f08ffada7cddc5990a7e74bee53a4",
"title": "bug(condition): Test 3",
"updated_at": "2023-04-14T15:58:38Z",
"url": "https://api.github.com/repos/Resnovas/smartcloud/pulls/480",
"statuses_url": "https://api.github.com/repos/Resnovas/smartcloud/statuses/b3e9b86e5d615c8539dc3e99a0acfbb44cda7af6",
"title": "🐛 bug(website): Test 2",
"updated_at": "2023-04-16T18:45:23Z",
"url": "https://api.github.com/repos/Resnovas/smartcloud/pulls/486",
"user": {
"avatar_url": "https://avatars.githubusercontent.com/u/11413796?v=4",
"events_url": "https://api.github.com/users/TGTGamer/events{/privacy}",
Expand Down Expand Up @@ -459,9 +464,9 @@
},
"private": false,
"pulls_url": "https://api.github.com/repos/Resnovas/smartcloud/pulls{/number}",
"pushed_at": "2023-04-14T15:58:38Z",
"pushed_at": "2023-04-16T18:07:10Z",
"releases_url": "https://api.github.com/repos/Resnovas/smartcloud/releases{/id}",
"size": 116862,
"size": 114625,
"ssh_url": "[email protected]:Resnovas/smartcloud.git",
"stargazers_count": 7,
"stargazers_url": "https://api.github.com/repos/Resnovas/smartcloud/stargazers",
Expand Down Expand Up @@ -502,14 +507,14 @@
}
},
"eventName": "pull_request_target",
"sha": "cad28cab729f6e14f881c5df9a9a3737e10d5f8e",
"sha": "1e432b80e3370bb3634c432995a4c5b7f5681393",
"ref": "refs/heads/main",
"workflow": "Project Management",
"action": "__self",
"actor": "TGTGamer",
"job": "release-mastermind",
"runNumber": 16085,
"runId": 4701637635,
"runNumber": 16110,
"runId": 4714850602,
"apiUrl": "https://api.github.com",
"serverUrl": "https://github.com",
"graphqlUrl": "https://api.github.com/graphql"
Expand Down
Loading

0 comments on commit dd13ed7

Please sign in to comment.