Merge branch 'develop' into automated-netcode-releases-1.x

Author: michalChrobot

.github/pull_request_template.md

@@ -4,14 +4,14 @@ Replace this block with what this PR does and why. Describe what you'd like revi
 )
 
 ### Jira ticket
-_Link to related jira ticket ([Use the smart commits](https://support.atlassian.com/bitbucket-cloud/docs/use-smart-commits/))_
+_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_
 
 ### Changelog
 [//]: # (updated with all public facing changes  - API changes, UI/UX changes, behaviour changes, bug fixes. Remove if not relevant.)
 
 - Added: The package whose Changelog should be added to should be in the header. Delete the changelog section entirely if it's not needed.
 - Fixed: If you update multiple packages, create a new section with a new header for the other package.
-- Removed/Deprecated/Changed: Each bullet should be prefixed with Added, Fixed, Removed, Deprecated, or Changed to indicate where the entry should go
+- Removed/Deprecated/Changed: Each bullet should be prefixed with Added, Fixed, Removed, Deprecated, or Changed to indicate where the entry should go.
 
 <!--  Uncomment and mark items off with a * if this PR deprecates any API:
 ### Deprecated API
@@ -31,12 +31,14 @@ We should always evaluate if the changes in this PR require any documentation ch
 - Includes documentation for previously-undocumented public API entry points.
 - Includes edits to existing public API documentation.
 
-## Testing & QA
+## Testing & QA (How your changes can be verified during release Playtest)
 [//]: #  (
 This section is REQUIRED and should describe how the changes were tested and how should they be tested when Playtesting for the release.
 It can range from "edge case covered by unit tests" to "manual testing required and new sample was added".
 Expectation is that PR creator does some manual testing and provides a summary of it here.)
 
+<!-- Add any performance testing results here if relevant. -->
+
 ### Functional Testing
 [//]: # (If checked, List manual tests that have been performed.)
 _Manual testing :_
@@ -50,12 +52,13 @@ _Does the change require QA team to:_
 
 - [ ] `Review automated tests`?
 - [ ] `Execute manual tests`?
+- [ ] `Provide feedback about the PR`?
 
-If any boxes above are checked, please add QA as a PR reviewer.
+If any boxes above are checked the QA team will be automatically added as a PR reviewer.
 
-## Backport
+## Backports
 [//]: # (
 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
 Add the following to the PR title: "\[Backport\] ..."
 If this is not needed, for example feature specific to NGOv2.X, then just mention this fact.
-)
+)

.github/workflows/conventional-pr.yml

@@ -17,7 +17,7 @@ jobs:
     steps:
       - name: semantic-pull-request
         # Internal Unity mirror available at jesseo/action-semantic-pull-request, but actions from private repos aren't supported, so continue to use the public one below
-        uses: amannn/action-semantic-pull-request@v5
+        uses: amannn/action-semantic-pull-request@v6
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:

.github/workflows/mark-stale-issue.yaml

@@ -18,7 +18,7 @@ jobs:
       issues: write
 
     steps:
-      - uses: actions/stale@v9
+      - uses: actions/stale@v10
         with:
           # Only mark issues (not PRs) as stale
           any-of-labels: 'stat:awaiting-response'

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

@@ -1,12 +1,12 @@
-# This workflow is designed to verify that the pull request description contains a required sections that are important from quality perspective.
+# This workflow is designed to verify that the pull request description contains a required sections that are important from quality perspective.
 # ## 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).
 # ## 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.
 # ## Documentation section is important to ensure that the documentation is updated with the changes made in the PR.
 
 # 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.
 # The workflow is configured to run when PR is created as well as when it is edited which also counts simple description edits.
 
-name: "NGO - PR Verification"
+name: "NGO - PR description validation"
 
 on:
   pull_request:
@@ -17,14 +17,14 @@ on:
       - release/*
 
 jobs:
-  pr-verification:
+  pr-description-validation:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Check PR description
-        uses: actions/github-script@v7
+        uses: actions/github-script@v8
         with:
           script: |
             const pr = context.payload.pull_request;
@@ -33,8 +33,8 @@ jobs:
             // List of mandatory PR sections
             const requiredSections = [
               {
-                header: '## Backport',
-                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.'
+                header: '## Backports',
+                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.'
               },
               {
                 header: '## Testing & QA',
@@ -43,6 +43,10 @@ jobs:
               {
                 header: '## Documentation',
                 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.'
+              },
+              {
+                header: '## Jira ticket',
+                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.'
               }
             ];
 
@@ -59,4 +63,4 @@ jobs:
               message += '\n\nPlease add them to your PR description.';
 
               core.setFailed(message);
-            }
+            }

.github/workflows/qa-reviewer-assignment.yml

@@ -0,0 +1,36 @@
+# This workflow depend on the content of .github/pull_request_template.md file, which should contain the required sections that the script checks for
+# This also works in parallel with .github/workflows/pr-description-validation.yml which validates PR format
+# 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
+
+# In case that the given checkboxes are marked the script will automatically add netcode-qa team as a reviewer.
+
+name: 'Assign QA Reviewer'
+
+on:
+  pull_request:
+    types: [opened, edited, synchronize, reopened]
+
+jobs:
+  assign-qa:
+    # This job only runs if the checkbox in the PR description exist and is checked.
+    if: >
+      contains(github.event.pull_request.body, '- [x] `Review automated tests`') ||
+      contains(github.event.pull_request.body, '- [x] `Execute manual tests`') ||
+      contains(github.event.pull_request.body, '- [x] `Provide feedback about the PR`')
+    runs-on: ubuntu-latest
+
+
+    steps:
+
+      - name: 'Assign QA Team'
+        uses: actions/github-script@v8
+        with:
+          github-token: ${{ secrets.GH_TOKEN }}
+          script: |
+            github.rest.pulls.requestReviewers({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              pull_number: context.issue.number,
+              team_reviewers: ['netcode-qa']
+            });
+            console.log('Assigned netcode-qa for review.');

.yamato/_triggers.yml

@@ -11,10 +11,13 @@
 # TRIGGER PATTERNS-------------------------------------------------------------------
   # Pull Request:
     # This test validates Standards, Package tests, Project tests and Desktop standalone tests to ensure that main platforms are covered
-    # Triggers on PRs to develop, develop, and release branches
-    # Focuses on critical validation paths that we should validate before merging PRs
-    # Cancels previous runs on new commits
-    # Excludes draft PRs
+    # Focuses on critical validation paths that we should validate before merging PRs. It also cancels previous runs on new commits
+    # By default it's triggered if
+      # 1) PR targets develop, develop-2.0.0 or release branches
+      # 2) PR is not a draft
+      # 3) PR changes files in package or testproject folders (doesn't run on for example DOCS only changes)
+  
+    # Note that in other cases you can trigger it by writing a comment "/ci ngo" in the PR thread
 
   # Nightly:
     # This test validates same subset as pull_request_trigger with addition of mobile/console tests and webgl builds
@@ -38,6 +41,7 @@
 
 #-----------------------------------------------------------------------------------
 
+
 # Run all relevant tasks when a pull request targeting the develop or release branch is created or updated.
 # In order to have better coverage we run desktop standalone tests with different configurations which allows to mostly cover for different platforms, scripting backends and editor versions.
 # Since standards job is a part of initial checks it's not present as direct dependency here
@@ -61,15 +65,18 @@ pull_request_trigger:
     # Coverage on other standalone machines is present in Nightly job so it's enough to not run all of them for PRs
     - .yamato/desktop-standalone-tests.yml#desktop_standalone_test_testproject_ubuntu_il2cpp_2022.3
   triggers:
+    # Note that PR tests will run ONLY if we are changing package/sample code. If changes are let's say docs only no tests will be triggered
+    # TODO: consider setting up and running tests from Examples/
+    # TODO: or docs only changes are spelling/link check
+    expression: |-
+      pull_request.comment eq "ngo" OR
+      ((pull_request.target eq "develop" OR
+      pull_request.target eq "develop-2.0.0" OR
+      pull_request.target match "release/*") AND
+      NOT pull_request.draft AND
+      (pull_request.changes.any match "com.unity.netcode.gameobjects/**" OR
+      pull_request.changes.any match "testproject/**"))
     cancel_old_ci: true
-    pull_requests:
-      - targets:
-          only:
-            - "develop"
-            - "develop-2.0.0"
-            - "/release\/.*/"
-      - drafts: false
-
 
 # Run all tests on 6000.2 (latest supported editor) on nightly basis.
 # Same subset as pull_request_trigger with addition of mobile/desktop/console tests and webgl builds

.yamato/disable-burst-if-requested.py

@@ -1,6 +1,7 @@
 @echo on
 rem This is an auto-generated script. Do not edit manually!
 
+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...
 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
 IF EXIST "infrastructure_instability_detection" rmdir /s /q infrastructure_instability_detection
 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/generated-scripts/infrastructure-instability-detection-win.cmd

@@ -48,6 +48,11 @@ mobile_standalone_build_{{ project.name }}_{{ platform.name }}_{{ editor }}:
 {% if platform.model %}
       model: {{ platform.model }} # This is set only in platforms where we want non-default model to use (more information in project.metafile)
 {% endif %}
+  # Automatic UI interruption handling is available for iPhones running iOS 15 and above (models SE-Gen3 and 13). 
+  # It is enabled by default when using those devices. Otherwise, system alerts (e.g. “Local Network Access” permission alert, introduced in iOS 14) might cause disruptions during test execution.
+  # If building of the test app is done on a separate (“Build”) job, please make sure that that job has environment variable UNITY_HANDLEUIINTERRUPTIONS set to 1.
+  variables:
+    UNITY_HANDLEUIINTERRUPTIONS: 1
   commands:
     - unity-downloader-cli -u {{ editor }} -c Editor -c il2cpp {% if platform.base == "mac" %} -c ios {% else %} -c android {% endif %} --wait
     - UnifiedTestRunner --suite=playmode --platform={{ platform.standalone }} --testproject={{ project.path }} --architecture={{ platform.architecture }} --scripting-backend=il2cpp --editor-location=.Editor --artifacts-path=artifacts --testfilter="Unity.Netcode.RuntimeTests.*" --player-save-path=build/players --extra-editor-arg=-batchmode --extra-editor-arg=-nographics --reruncount=1 --clean-library-on-rerun --build-only --timeout=1800
@@ -96,7 +101,7 @@ mobile_standalone_test_{{ project.name }}_{{ platform.name }}_{{ editor }}:
 {% else %}
 
     # Run tests for non-Android devices
-    - UnifiedTestRunner --suite=playmode --platform={{ platform.standalone }} --artifacts-path=test-results --player-load-path=build/players --testproject={{ project.path }} --editor-location=.Editor --fail-on-assert --reruncount=1 --clean-library-on-rerun --timeout=3600
+    - UnifiedTestRunner --suite=playmode --platform={{ platform.standalone }} --artifacts-path=test-results --player-load-path=build/players --testproject={{ project.path }} --editor-location=.Editor --fail-on-assert --reruncount=1 --clean-library-on-rerun --timeout=3600 --device-id=%BOKKEN_DEVICE_ID%
 {% endif %}
   artifacts:
     logs:

.yamato/mobile-standalone-test.yml

@@ -3,8 +3,9 @@
 NetcodeProjects:
     # Note that we are using internal Unity repo. This means that we may test with newest changes that are not yet released to our users (there are also public versions)
     # Note that for BossRoom 'main' branch supports NGOv1.X and 'develop' branch supports NGOv2.X
+    # Recently (19.08.2025) BossRoom got an update to 3.0.0 version which updated everything to U6 and NGOv2.X. Because of that I branched out from last commit that was supporting NGOv1.X for our playtest usage
     BossRoom:
         GithubRepo: "https://github.com/Unity-Technologies/com.unity.multiplayer.samples.coop.git"
-        branch: main
+        branch: playtest/ngo-1.x
         manifestPath: Packages/manifest.json
         projectPath: '.'