Merge branch 'develop-2.0.0' into chore/session-owner-promotion-and-connection-approved-upates

Author: NoelStephensUnity

.github/ISSUE_TEMPLATE/bug_report.md

@@ -2,7 +2,7 @@
 name: Bug report
 about: Create a report to help us improve
 title: ''
-labels: stat:awaiting triage, type:bug
+labels: stat:awaiting-triage, stat:reply-needed, type:bug
 assignees: ''
 
 ---
@@ -40,4 +40,4 @@ If applicable, add screenshots to help explain your problem.
 
 ### Additional Context
 
-Add any other context about the problem here. Logs, code snippets would be useful here but please also consider attaching a minimal Unity project that reproduces the issue.
+Add any other context about the problem here. Logs, code snippets would be useful here but please also consider attaching a minimal Unity project that reproduces the issue.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -2,7 +2,7 @@
 name: Feature Request
 about: Suggest an idea for this project
 title: ''
-labels: stat:awaiting triage, type:feature
+labels: stat:awaiting-triage, stat:reply-needed, type:feature
 assignees: ''
 
 ---

.github/ISSUE_TEMPLATE/rfc-tracking-issue.md

@@ -1,36 +1,64 @@
-<!-- Replace this block with what this PR does and why. Describe what you'd like reviewers to know, how you applied the engineering principles, and any interesting tradeoffs made. Delete bullet points below that don't apply, and update the changelog section as appropriate. -->
+## Purpose of this PR
+[//]: # (
+Replace this block with what this PR does and why. Describe what you'd like reviewers to know, how you applied the engineering principles, and any interesting tradeoffs made. 
+)
 
-<!-- Add short version of the JIRA ticket to the PR title (e.g. "feat: new shiny feature [MTT-123]") -->
+### Jira ticket
+_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
+### 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. 
+- 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.
 
-## Testing and Documentation
-
-- No tests have been added.
-- Includes unit tests.
-- Includes integration tests.
-- No documentation changes or additions were necessary.
-- Includes documentation for previously-undocumented public API entry points.
-- Includes edits to existing public API documentation.
-
 <!--  Uncomment and mark items off with a * if this PR deprecates any API:
 ### Deprecated API
 - [ ] An `[Obsolete]` attribute was added along with a `(RemovedAfter yyyy-mm-dd)` entry.
-- [ ] An [api updater] was added.
+- [ ] An [api updater](https://confluence.unity3d.com/display/DEV/Obsolete+API+updaters) was added.
 - [ ] Deprecation of the API is explained in the CHANGELOG.
 - [ ] The users can understand why this API was removed and what they should use instead.
 -->
 
-## Backport
+## Documentation
+[//]: # (
+This section is REQUIRED and should mention what documentation changes were following the changes in this PR. 
+We should always evaluate if the changes in this PR require any documentation changes.
+)
+
+- No documentation changes or additions were necessary.
+- Includes documentation for previously-undocumented public API entry points.
+- Includes edits to existing public API documentation.
+
+## 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 :_
+- [ ] `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`?
+- [ ] `Provide feedback about the PR`?
+
+If any boxes above are checked the QA team will be automatically added as a PR reviewer.
 
-<!-- If this is a backport:
- - Add the following to the PR title: "\[Backport\] ..." .
- - Link to the original PR.
-If this needs a backport - state this here
-If a backport is not needed please provide the reason why.
-If the "Backports" section is not present it will lead to a CI test failure. 
--->
+## 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/pull_request_template.md

@@ -16,8 +16,7 @@
     "com.unity.netcode.gameobjects/**/*",
     "Examples/**/*",
     "testproject/**/*",
-    "minimalproject/**/*",
-    "testproject-tools-integration/**/*"
+    "minimalproject/**/*"
   ],
   "packageRules": [
     // Run unity-upm-project and unity-upm-package only on weekends to reduce PR noise

.github/renovate.json5

@@ -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/backport-verification.yml

@@ -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/conventional-pr.yml

@@ -0,0 +1,66 @@
+# 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 description validation"
+
+on:
+  pull_request:
+    types: [opened, edited, synchronize, reopened]
+    branches:
+      - develop
+      - develop-2.0.0
+      - release/*
+
+jobs:
+  pr-description-validation:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v5
+
+      - name: Check PR description
+        uses: actions/github-script@v8
+        with:
+          script: |
+            const pr = context.payload.pull_request;
+            const body = pr.body || '';
+
+            // List of mandatory PR sections
+            const requiredSections = [
+              {
+                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',
+                description: 'PR description must include a "## Testing & QA" section. Please add this section and provide information about the testing performed for this PR. It can range from adding unit tests to full samples and is needed from QA side to analyze PRs while Playtesting for the release.'
+              },
+              {
+                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.'
+              }
+            ];
+
+            const missing = requiredSections.filter(section => !body.includes(section.header));
+
+            if (missing.length > 0) {
+              let message = 'PR description is missing the following required section(s):\n';
+
+              const missingDescriptions = missing.map(
+                s => `- ${s.header}: ${s.description}`
+              );
+
+              message += missingDescriptions.join('\n');
+              message += '\n\nPlease add them to your PR description.';
+
+              core.setFailed(message);
+            }

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

@@ -0,0 +1,66 @@
+# GitHub Actions workflow to monitor Yamato CI job state on pull requests
+# We are using https://cli.github.com/manual/gh_pr_checks
+# The aim is to ensure that conditionally triggered Yamato jobs are completed successfully before allowing merges
+
+# This job will be required in branch protection rules for develop, develop-2.0.0, and release/* branches. It's only goal will be to ensure that Yamato jobs are completed successfully before allowing Pr to merge.
+# Note that conditional jobs will have 30s to show which is always the cas since they are showing up as soon as in distribution stage.
+
+name: Yamato PR Supervisor
+
+on:
+  pull_request:
+    types: [opened, synchronize, reopened]
+    branches:
+      - develop
+      - develop-2.0.0
+      - release/*
+        
+concurrency:
+  group: pr-${{ github.event.pull_request.number }}
+  cancel-in-progress: true
+
+jobs:
+  yamato-supervisor:
+    runs-on: ubuntu-latest
+    timeout-minutes: 720
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        
+      - name: Wait and Verify Yamato Job Status
+        env:
+          GH_TOKEN: ${{ secrets.GH_TOKEN }}
+          PR_NUMBER: ${{ github.event.pull_request.number }}
+        run: |
+          set -e
+          
+          
+          MAX_ATTEMPTS=$((12*60))
+          INTERVAL=60
+          
+          sleep $INTERVAL
+          for ((i=1;i<=MAX_ATTEMPTS;i++)); do
+            echo "Polling PR checks (attempt $i/$MAX_ATTEMPTS)..."
+          
+            # We want to watch for pending checks beside this check
+            checks=$(gh pr checks $PR_NUMBER --json name,state --jq '[ .[] | select(.name != "yamato-supervisor") ]')
+            
+            pending=$(echo "$checks" | jq '[.[] | select(.state == "PENDING")] | length')
+            skipping=$(echo "$checks" | jq '[.[] | select(.state == "SKIPPED")] | length')
+            passed=$(echo "$checks" | jq '[.[] | select(.state == "SUCCESS")] | length')
+            failed=$(echo "$checks" | jq '[.[] | select(.state == "FAILURE")] | length')
+          
+            echo "Pending checks: $pending, Skipping checks: $skipping", Passed checks: $passed, Failed checks: $failed
+          
+            if [[ "$failed" -gt 0 ]]; then
+              echo "A check has failed! Failing fast."
+              exit 1
+            fi
+
+            if [[ "$pending" -eq 0 ]] && [[ "$passed" -gt 0 ]]; then
+              echo "All non-supervisor checks are completed!"
+              exit 0
+            fi
+          
+            sleep $INTERVAL
+          done