Skip to content

Commit eed0578

Browse files
ci: [BACKPORT] Improvement of PR template (#3629)
## Purpose of this PR This is a backport of #3628 Following on N4E investigation I added a functionality of automatic assignement of netcode-qa as a PR reviewer if one of the checkboxes is marked. Additionally note that **Jira Ticket** section is now mandatory buy of course you can always write N/A under it I also modified github action runners to use the recommended one ### Jira ticket MTT-12822 ## Documentation Included comments in the scripts ## Testing & QA Will check one of the checkboxes to see if netcode-qa is being properly added as reviewer, other then that no specific testing is required ### Functional Testing _Manual testing :_ - [ ] `Manual testing done` _Automated tests:_ - [ ] `Covered by existing automated tests` - [ ] `Covered by new automated tests` _Does the change require QA team to:_ - [ ] `Review automated tests`? - [ ] `Execute manual tests`? - [x] `Provide feedback about the PR` If any boxes above are checked the QA team will be automatically added as a PR reviewer. ## Backports [Will do](#3628) --------- Co-authored-by: Emma <[email protected]>
1 parent 1bd2145 commit eed0578

File tree

3 files changed

+55
-12
lines changed

3 files changed

+55
-12
lines changed

.github/pull_request_template.md

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ Replace this block with what this PR does and why. Describe what you'd like revi
44
)
55

66
### Jira ticket
7-
_Link to related jira ticket ([Use the smart commits](https://support.atlassian.com/bitbucket-cloud/docs/use-smart-commits/))_
7+
_Link to related jira ticket ([Use the smart commits](https://support.atlassian.com/bitbucket-cloud/docs/use-smart-commits/)). Short version (e.g. MTT-123) also works and gets auto-linked_
88

99
### Changelog
1010
[//]: # (updated with all public facing changes - API changes, UI/UX changes, behaviour changes, bug fixes. Remove if not relevant.)
1111

1212
- Added: The package whose Changelog should be added to should be in the header. Delete the changelog section entirely if it's not needed.
1313
- Fixed: If you update multiple packages, create a new section with a new header for the other package.
14-
- Removed/Deprecated/Changed: Each bullet should be prefixed with Added, Fixed, Removed, Deprecated, or Changed to indicate where the entry should go
14+
- Removed/Deprecated/Changed: Each bullet should be prefixed with Added, Fixed, Removed, Deprecated, or Changed to indicate where the entry should go.
1515

1616
<!-- Uncomment and mark items off with a * if this PR deprecates any API:
1717
### Deprecated API
@@ -31,12 +31,14 @@ We should always evaluate if the changes in this PR require any documentation ch
3131
- Includes documentation for previously-undocumented public API entry points.
3232
- Includes edits to existing public API documentation.
3333

34-
## Testing & QA
34+
## Testing & QA (How your changes can be verified during release Playtest)
3535
[//]: # (
3636
This section is REQUIRED and should describe how the changes were tested and how should they be tested when Playtesting for the release.
3737
It can range from "edge case covered by unit tests" to "manual testing required and new sample was added".
3838
Expectation is that PR creator does some manual testing and provides a summary of it here.)
3939

40+
<!-- Add any performance testing results here if relevant. -->
41+
4042
### Functional Testing
4143
[//]: # (If checked, List manual tests that have been performed.)
4244
_Manual testing :_
@@ -50,12 +52,13 @@ _Does the change require QA team to:_
5052

5153
- [ ] `Review automated tests`?
5254
- [ ] `Execute manual tests`?
55+
- [ ] `Provide feedback about the PR`?
5356

54-
If any boxes above are checked, please add QA as a PR reviewer.
57+
If any boxes above are checked the QA team will be automatically added as a PR reviewer.
5558

56-
## Backport
59+
## Backports
5760
[//]: # (
5861
This section is REQUIRED and should link to the PR that targets other NGO version which is either develop or develop-2.0.0 branch
5962
Add the following to the PR title: "\[Backport\] ..."
6063
If this is not needed, for example feature specific to NGOv2.X, then just mention this fact.
61-
)
64+
)

.github/workflows/pr-verification.yml renamed to .github/workflows/pr-description-validation.yml

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
# This workflow is designed to verify that the pull request description contains a required sections that are important from quality perspective.
1+
# This workflow is designed to verify that the pull request description contains a required sections that are important from quality perspective.
22
# ## Backport section is important as a reminder to account for backports for anyone that works with NGO repository (to 1.X or 2.X branches respectively).
33
# ## Testing & QA section is important to ensure that the PR has appropriate testing coverage and is important when QA will evaluate PRs before Playtesting for the release.
44
# ## Documentation section is important to ensure that the documentation is updated with the changes made in the PR.
55

66
# If any of the sections is missing, the workflow will fail and block the PR from merging, prompting the developer to add those sections to the PR description.
77
# The workflow is configured to run when PR is created as well as when it is edited which also counts simple description edits.
88

9-
name: "NGO - PR Verification"
9+
name: "NGO - PR description validation"
1010

1111
on:
1212
pull_request:
@@ -17,7 +17,7 @@ on:
1717
- release/*
1818

1919
jobs:
20-
pr-verification:
20+
pr-description-validation:
2121
runs-on: ubuntu-latest
2222
steps:
2323
- name: Checkout code
@@ -33,8 +33,8 @@ jobs:
3333
// List of mandatory PR sections
3434
const requiredSections = [
3535
{
36-
header: '## Backport',
37-
description: 'PR description must include a "## Backport" section. Please add this section and provide information about this PR backport to develop or develop-2.0.0 branch respectively or explain why backport is not needed.'
36+
header: '## Backports',
37+
description: 'PR description must include a "## Backports" section. Please add this section and provide information about this PR backport to develop or develop-2.0.0 branch respectively or explain why backport is not needed.'
3838
},
3939
{
4040
header: '## Testing & QA',
@@ -43,6 +43,10 @@ jobs:
4343
{
4444
header: '## Documentation',
4545
description: 'PR description must include a "## Documentation" section. Please add this section and provide information about the documentation changes made in this PR. It is important to keep the documentation up to date with the code changes.'
46+
},
47+
{
48+
header: '## Jira ticket',
49+
description: 'PR description must include a "## Jira ticket" section. Please add this section and provide a link to the Jira ticket that corresponds to this PR. General rule should be that if the PR takes you more then a day of work it should have Jira ticket. Otherwise you can always write "N/A" in this section.'
4650
}
4751
];
4852
@@ -59,4 +63,4 @@ jobs:
5963
message += '\n\nPlease add them to your PR description.';
6064
6165
core.setFailed(message);
62-
}
66+
}
Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
# This workflow depend on the content of .github/pull_request_template.md file, which should contain the required sections that the script checks for
2+
# This also works in parallel with .github/workflows/pr-description-validation.yml which validates PR format
3+
# In contrast to .github/workflows/pr-description-validation.yml, this workflow is conditional and aims to ease the process of requesting QA review by automatically assigning the QA team whenever a checkbox is marked
4+
5+
# In case that the given checkboxes are marked the script will automatically add netcode-qa team as a reviewer.
6+
7+
name: 'Assign QA Reviewer'
8+
9+
on:
10+
pull_request:
11+
types: [opened, edited, synchronize, reopened]
12+
13+
jobs:
14+
assign-qa:
15+
# This job only runs if the checkbox in the PR description exist and is checked.
16+
if: >
17+
contains(github.event.pull_request.body, '- [x] `Review automated tests`') ||
18+
contains(github.event.pull_request.body, '- [x] `Execute manual tests`') ||
19+
contains(github.event.pull_request.body, '- [x] `Provide feedback about the PR`')
20+
runs-on: ubuntu-latest
21+
22+
23+
steps:
24+
25+
- name: 'Assign QA Team'
26+
uses: actions/github-script@v7
27+
with:
28+
github-token: ${{ secrets.GH_TOKEN }}
29+
script: |
30+
github.rest.pulls.requestReviewers({
31+
owner: context.repo.owner,
32+
repo: context.repo.repo,
33+
pull_number: context.issue.number,
34+
team_reviewers: ['netcode-qa']
35+
});
36+
console.log('Assigned netcode-qa for review.');

0 commit comments

Comments
 (0)