chore: Updated aspects of Netcode package in anticipation of v3.1.0 release

.github/CODEOWNERS

@@ -10,4 +10,4 @@ AssemblyInfo.cs @NoelStephensUnity @EmandM @Unity-Technologies/netcode-qa
 .github/ @NoelStephensUnity @EmandM @Unity-Technologies/netcode-qa
 .yamato/ @NoelStephensUnity @EmandM @Unity-Technologies/netcode-qa
 com.unity.netcode.gameobjects/Documentation*/ @jabbacakes
-com.unity.netcode.gameobjects/Runtime/Transports/UTP/ @Unity-Technologies/multiplayer-workflows
+com.unity.netcode.gameobjects/Runtime/Transports/UTP/ @simon-lemay-unity

.github/pull_request_template.md

@@ -56,6 +56,12 @@ _Does the change require QA team to:_
 
 If any boxes above are checked the QA team will be automatically added as a PR reviewer.
 
+## Up-port
+[//]: # (
+This section is REQUIRED and should link to the PR that targets develop-3.0.0 branch. Assuming that the PR lands agains default develop-2.0.0 branch
+If this is not needed, for example feature specific to NGOv2.X, then just mention this fact.
+)
+
 ## 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

.github/renovate.json5

@@ -1,5 +1,5 @@
 {
-  "baseBranches": ["develop", "develop-2.0.0"],
+  "baseBranches": ["develop-2.0.0"],
   "dependencyDashboard": true,
 
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
@@ -27,10 +27,12 @@
         "unity-upm-package"
       ],
       "enabled": "true",
-      "schedule": [
-        "every weekend"
-      ],
+      "schedule": ["every weekend"],
       "rollbackPrs": false,
+    },
+    {
+      "groupName": "CI deps updates",
+      "matchPackagePatterns": ["^RecipeEngine", "actions/checkout", "package-ci/ubuntu-22.04"]
     }
   ],
 }

.github/workflows/autoupdate.yaml

@@ -4,6 +4,7 @@ on:
     branches:
       - develop
       - develop-2.0.0
+      - develop-3.x.x
 jobs:
   autoupdate:
     name: auto-update

.github/workflows/conventional-pr.yml

@@ -6,6 +6,7 @@ on:
     branches:
     - develop
     - develop-2.0.0
+    - develop-3.x.x
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
   # This workflow contains a single job called "build"

.github/workflows/pr-description-validation.yml

@@ -14,14 +14,15 @@ on:
     branches:
       - develop
       - develop-2.0.0
+      - develop-3.x.x
       - release/*
 
 jobs:
   pr-description-validation:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7
 
       - name: Check PR description
         uses: actions/github-script@v9
@@ -30,17 +31,17 @@ jobs:
             const pr = context.payload.pull_request;
             const body = pr.body || '';
 
-            // List of users to skip description validation
+            // List of user patterns to skip description validation
             // This should be automations where we don't care that much about the description format
-            const skipUsersPrefixes = [
-              'unity-renovate',
-              'svc-'
+            const skipUserPatterns = [
+              /^unity-renovate/,
+              /svc/
             ];
-            
-            // If PR author is in the skip list, exit early
+
+            // If PR author matches the skip list, exit early
             const author = pr.user.login;
             console.log(`PR author: ${author}`);
-            if (skipUsersPrefixes.some(prefix => author.startsWith(prefix))) {
+            if (skipUserPatterns.some(pattern => pattern.test(author))) {
               console.log(`Skipping PR description check for user: ${author}`);
               return;
             }
@@ -51,6 +52,10 @@ jobs:
                 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: '## Up-port',
+                description: 'PR description must include a "## Up-port" section. Please add this section and provide information about this PR up-port to develop-3.0.0 branch or explain why up-port 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.'

.github/workflows/pr-supervisor.yaml

@@ -2,8 +2,8 @@
 # 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.
+# This job will be required in branch protection rules for develop 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 case since they are showing up as soon as in distribution stage.
 
 name: Yamato PR Supervisor
 
@@ -13,8 +13,9 @@ on:
     branches:
       - develop
       - develop-2.0.0
+      - develop-3.x.x
       - release/*
-        
+
 concurrency:
   group: pr-${{ github.event.pull_request.number }}
   cancel-in-progress: true
@@ -23,13 +24,20 @@ jobs:
   yamato-supervisor:
     runs-on: ubuntu-latest
     timeout-minutes: 720
+    permissions:
+      actions: read
+      checks: read
+      statuses: read
+      pull-requests: read
+      contents: read
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v6
-
+        uses: actions/checkout@v4
+
+
       - name: Wait and Verify Yamato Job Status
         env:
-          GH_TOKEN: ${{ secrets.GH_TOKEN }}
+          GH_TOKEN: ${{ github.token }}
           PR_NUMBER: ${{ github.event.pull_request.number }}
         run: |
           set -e
@@ -42,18 +50,25 @@ jobs:
           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") ]')
-
+            # gh pr checks exits non-zero while checks are pending (8) or failing (1); we evaluate state ourselves, so don't let that abort the loop.
+            checks=$(gh pr checks $PR_NUMBER --json name,state --jq '[ .[] | select(.name != "yamato-supervisor") ]') || true
+
+            if [[ -z "$checks" ]]; then
+              echo "No non-supervisor checks reported yet; waiting..."
+              sleep $INTERVAL
+              continue
+            fi
+
             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
+            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."
+              echo "If you rerun the job and everything is green then just rerun this job as well."
               exit 1
             fi
 

.gitignore

@@ -12,3 +12,5 @@ utr.bat
 Tools/CI/bin
 Tools/CI/obj
 
+# Do not include the packages-lock file
+packages-lock.json

.pr_agent.toml

@@ -1,2 +1,9 @@
+# This is the configuration for the u-pr bot
+# https://github.cds.internal.unity3d.com/unity/u-pr
+# For configuration of this file:
+# https://developer.portal.internal.unity.com/catalog/default/component/u-pr/docs/configuration/automatic_runs/
+
 [github_app]
-pr_commands = []
+handle_pr_actions = ['opened', 'ready_for_review']  # PR events that auto-run pr_commands
+pr_commands       = ["/harness-review"]             # what runs on those events
+reviewer_commands = ["/harness-review"]             # what runs when @u-pr is added as reviewer