Skip to content

Commit b7c4ea6

Browse files
Merge branch 'develop-2.0.0' into chore/remove_feature_requests
2 parents c109e04 + fbb3457 commit b7c4ea6

16 files changed

+175
-61
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.');

.yamato/generated-scripts/infrastructure-instability-detection-win.cmd

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
@echo on
22
rem This is an auto-generated script. Do not edit manually!
33

4+
if exist "%TEMP%\BugReporterCrashReportJson" for /f "delims=" %%i in ('dir /b /a-d "%TEMP%\BugReporterCrashReportJson\*.json"') do curl -X POST -H "Content-Type: application/json" -T "%TEMP%\BugReporterCrashReportJson\%%i" "https://internal-crash-collector.prd.cds.internal.unity3d.com/api/crash" || echo Failed to upload %%i. Ignoring...
45
curl -fs "https://artifactory-slo.bf.unity3d.com/artifactory/automation-and-tooling/infrastructure-instability-detection/standalone/1.0.0/windows.zip" --output "infrastructure_instability_detection_standalone.zip" --retry 5
56
IF EXIST "infrastructure_instability_detection" rmdir /s /q infrastructure_instability_detection
67
powershell.exe -nologo -noprofile -command "& { Add-Type -A 'System.IO.Compression.FileSystem'; [IO.Compression.ZipFile]::ExtractToDirectory('infrastructure_instability_detection_standalone.zip', '.'); }" && DEL "infrastructure_instability_detection_standalone.zip"

.yamato/project.metafile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,7 @@ validation_editors:
157157
all:
158158
- 6000.0
159159
- 6000.2
160+
- 6000.3
160161
- trunk
161162
minimal:
162163
- 6000.0

.yamato/wrench/api-validation-jobs.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ api_validation_-_netcode_gameobjects_-_6000_0_-_windows:
5151
dependencies:
5252
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
5353
variables:
54-
UPMPVP_CONTEXT_WRENCH: 1.0.1.0
54+
UPMPVP_CONTEXT_WRENCH: 1.1.0.0
5555
metadata:
5656
Job Maintainers: '#rm-packageworks'
57-
Wrench: 1.0.1.0
57+
Wrench: 1.1.0.0
5858

.yamato/wrench/package-pack-jobs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,5 @@ package_pack_-_netcode_gameobjects:
2424
UPMCI_ACK_LARGE_PACKAGE: 1
2525
metadata:
2626
Job Maintainers: '#rm-packageworks'
27-
Wrench: 1.0.1.0
27+
Wrench: 1.1.0.0
2828

.yamato/wrench/preview-a-p-v.yml

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ all_preview_apv_jobs:
1616
- path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_3_-_windows
1717
metadata:
1818
Job Maintainers: '#rm-packageworks'
19-
Wrench: 1.0.1.0
19+
Wrench: 1.1.0.0
2020

2121
# Functional tests for dependents found in the latest 6000.0 manifest (MacOS).
2222
preview_apv_-_6000_0_-_macos:
@@ -67,10 +67,10 @@ preview_apv_-_6000_0_-_macos:
6767
dependencies:
6868
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
6969
variables:
70-
UPMPVP_CONTEXT_WRENCH: 1.0.1.0
70+
UPMPVP_CONTEXT_WRENCH: 1.1.0.0
7171
metadata:
7272
Job Maintainers: '#rm-packageworks'
73-
Wrench: 1.0.1.0
73+
Wrench: 1.1.0.0
7474

7575
# Functional tests for dependents found in the latest 6000.0 manifest (Ubuntu).
7676
preview_apv_-_6000_0_-_ubuntu:
@@ -121,10 +121,10 @@ preview_apv_-_6000_0_-_ubuntu:
121121
dependencies:
122122
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
123123
variables:
124-
UPMPVP_CONTEXT_WRENCH: 1.0.1.0
124+
UPMPVP_CONTEXT_WRENCH: 1.1.0.0
125125
metadata:
126126
Job Maintainers: '#rm-packageworks'
127-
Wrench: 1.0.1.0
127+
Wrench: 1.1.0.0
128128

129129
# Functional tests for dependents found in the latest 6000.0 manifest (Windows).
130130
preview_apv_-_6000_0_-_windows:
@@ -176,10 +176,10 @@ preview_apv_-_6000_0_-_windows:
176176
dependencies:
177177
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
178178
variables:
179-
UPMPVP_CONTEXT_WRENCH: 1.0.1.0
179+
UPMPVP_CONTEXT_WRENCH: 1.1.0.0
180180
metadata:
181181
Job Maintainers: '#rm-packageworks'
182-
Wrench: 1.0.1.0
182+
Wrench: 1.1.0.0
183183

184184
# Functional tests for dependents found in the latest 6000.2 manifest (MacOS).
185185
preview_apv_-_6000_2_-_macos:
@@ -230,10 +230,10 @@ preview_apv_-_6000_2_-_macos:
230230
dependencies:
231231
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
232232
variables:
233-
UPMPVP_CONTEXT_WRENCH: 1.0.1.0
233+
UPMPVP_CONTEXT_WRENCH: 1.1.0.0
234234
metadata:
235235
Job Maintainers: '#rm-packageworks'
236-
Wrench: 1.0.1.0
236+
Wrench: 1.1.0.0
237237

238238
# Functional tests for dependents found in the latest 6000.2 manifest (Ubuntu).
239239
preview_apv_-_6000_2_-_ubuntu:
@@ -284,10 +284,10 @@ preview_apv_-_6000_2_-_ubuntu:
284284
dependencies:
285285
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
286286
variables:
287-
UPMPVP_CONTEXT_WRENCH: 1.0.1.0
287+
UPMPVP_CONTEXT_WRENCH: 1.1.0.0
288288
metadata:
289289
Job Maintainers: '#rm-packageworks'
290-
Wrench: 1.0.1.0
290+
Wrench: 1.1.0.0
291291

292292
# Functional tests for dependents found in the latest 6000.2 manifest (Windows).
293293
preview_apv_-_6000_2_-_windows:
@@ -339,10 +339,10 @@ preview_apv_-_6000_2_-_windows:
339339
dependencies:
340340
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
341341
variables:
342-
UPMPVP_CONTEXT_WRENCH: 1.0.1.0
342+
UPMPVP_CONTEXT_WRENCH: 1.1.0.0
343343
metadata:
344344
Job Maintainers: '#rm-packageworks'
345-
Wrench: 1.0.1.0
345+
Wrench: 1.1.0.0
346346

347347
# Functional tests for dependents found in the latest 6000.3 manifest (MacOS).
348348
preview_apv_-_6000_3_-_macos:
@@ -393,10 +393,10 @@ preview_apv_-_6000_3_-_macos:
393393
dependencies:
394394
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
395395
variables:
396-
UPMPVP_CONTEXT_WRENCH: 1.0.1.0
396+
UPMPVP_CONTEXT_WRENCH: 1.1.0.0
397397
metadata:
398398
Job Maintainers: '#rm-packageworks'
399-
Wrench: 1.0.1.0
399+
Wrench: 1.1.0.0
400400

401401
# Functional tests for dependents found in the latest 6000.3 manifest (Ubuntu).
402402
preview_apv_-_6000_3_-_ubuntu:
@@ -447,10 +447,10 @@ preview_apv_-_6000_3_-_ubuntu:
447447
dependencies:
448448
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
449449
variables:
450-
UPMPVP_CONTEXT_WRENCH: 1.0.1.0
450+
UPMPVP_CONTEXT_WRENCH: 1.1.0.0
451451
metadata:
452452
Job Maintainers: '#rm-packageworks'
453-
Wrench: 1.0.1.0
453+
Wrench: 1.1.0.0
454454

455455
# Functional tests for dependents found in the latest 6000.3 manifest (Windows).
456456
preview_apv_-_6000_3_-_windows:
@@ -502,8 +502,8 @@ preview_apv_-_6000_3_-_windows:
502502
dependencies:
503503
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
504504
variables:
505-
UPMPVP_CONTEXT_WRENCH: 1.0.1.0
505+
UPMPVP_CONTEXT_WRENCH: 1.1.0.0
506506
metadata:
507507
Job Maintainers: '#rm-packageworks'
508-
Wrench: 1.0.1.0
508+
Wrench: 1.1.0.0
509509

.yamato/wrench/promotion-jobs.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -118,10 +118,10 @@ publish_dry_run_netcode_gameobjects:
118118
ignore_artifact: true
119119
variables:
120120
UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
121-
UPMPVP_CONTEXT_WRENCH: 1.0.1.0
121+
UPMPVP_CONTEXT_WRENCH: 1.1.0.0
122122
metadata:
123123
Job Maintainers: '#rm-packageworks'
124-
Wrench: 1.0.1.0
124+
Wrench: 1.1.0.0
125125

126126
# Publish for netcode.gameobjects to https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-npm
127127
publish_netcode_gameobjects:
@@ -240,8 +240,8 @@ publish_netcode_gameobjects:
240240
ignore_artifact: true
241241
variables:
242242
UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
243-
UPMPVP_CONTEXT_WRENCH: 1.0.1.0
243+
UPMPVP_CONTEXT_WRENCH: 1.1.0.0
244244
metadata:
245245
Job Maintainers: '#rm-packageworks'
246-
Wrench: 1.0.1.0
246+
Wrench: 1.1.0.0
247247

.yamato/wrench/recipe-regeneration.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,5 @@ test_-_wrench_jobs_up_to_date:
2626
cancel_old_ci: true
2727
metadata:
2828
Job Maintainers: '#rm-packageworks'
29-
Wrench: 1.0.1.0
29+
Wrench: 1.1.0.0
3030

0 commit comments

Comments
 (0)