Merge branch 'develop-2.0.0' into experimental/v2-x-x/ngo-and-n4e

Author: NoelStephensUnity

.github/CODEOWNERS

@@ -10,3 +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

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

@@ -21,14 +21,29 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Check PR description
         uses: actions/github-script@v8
         with:
           script: |
             const pr = context.payload.pull_request;
             const body = pr.body || '';
+            
+            // List of users to skip description validation
+            // This should be automations where we don't care that much about the description format
+            const skipUsersPrefixes = [
+              'unity-renovate',
+              'svc-'
+            ];
+            
+            // If PR author is in the skip list, exit early
+            const author = pr.user.login;
+            console.log(`PR author: ${author}`);
+            if (skipUsersPrefixes.some(prefix => author.startsWith(prefix))) {
+              console.log(`Skipping PR description check for user: ${author}`);
+              return;
+            }
 
             // List of mandatory PR sections
             const requiredSections = [

.github/workflows/pr-supervisor.yaml

@@ -25,7 +25,7 @@ jobs:
     timeout-minutes: 720
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Wait and Verify Yamato Job Status
         env:

.yamato/_run-all.yml

@@ -16,7 +16,7 @@ run_quick_checks:
   name: Run Quick Initial Checks
   dependencies:
     # Ensure the code is running to our current standards
-    - .yamato/project-standards.yml#standards_ubuntu_testproject_trunk
+    - .yamato/project-standards.yml#standards_ubuntu_testproject_{{ validation_editors.default }}
     # This is needed for most of the jobs to execute tests + it runs xray PVP checks (all fast checks)
     - .yamato/package-pack.yml#package_pack_-_ngo_win
 

.yamato/_triggers.yml

@@ -51,7 +51,7 @@
 pr_minimal_required_checks:
   name: Minimal PR checks
   dependencies:
-    - .yamato/project-standards.yml#standards_ubuntu_testproject_trunk
+    - .yamato/project-standards.yml#standards_ubuntu_testproject_{{ validation_editors.default }}
     - .yamato/package-pack.yml#package_pack_-_ngo_win
   triggers:
     expression: |-
@@ -87,10 +87,8 @@ pr_code_changes_checks:
     # Coverage on other standalone machines is present in Nightly job so it's enough to not run all of them for PRs
     # desktop_standalone_test and cmb_service_standalone_test are both reusing desktop_standalone_build dependency so we run those in the same configuration on PRs to reduce waiting time.
     # Note that our daily tests will anyway run both test configurations in "minimal supported" and "trunk" configurations
-
-    # TODO: Move these tests back to trunk once CMB Service has addressed https://jira.unity3d.com/browse/MTTB-1680
-    - .yamato/desktop-standalone-tests.yml#desktop_standalone_test_testproject_ubuntu_il2cpp_6000.4
-    - .yamato/cmb-service-standalone-tests.yml#cmb_service_standalone_test_testproject_ubuntu_il2cpp_6000.4
+    - .yamato/desktop-standalone-tests.yml#desktop_standalone_test_testproject_ubuntu_il2cpp_trunk
+    - .yamato/cmb-service-standalone-tests.yml#cmb_service_standalone_test_testproject_ubuntu_il2cpp_trunk
   triggers:
     expression: |-
       (pull_request.comment eq "ngo" OR
@@ -130,7 +128,7 @@ develop_nightly:
         rerun: always
   dependencies:
     # Run project standards to verify package/default project
-    - .yamato/project-standards.yml#standards_ubuntu_testproject_trunk
+    - .yamato/project-standards.yml#standards_ubuntu_testproject_{{ validation_editors.default }}
     # Run APV jobs to make sure the change won't break any dependants
     - .yamato/wrench/preview-a-p-v.yml#all_preview_apv_jobs
     # Run package EditMode and Playmode tests on desktop platforms on trunk and 6000.0
@@ -190,4 +188,4 @@ develop_weekly_trunk:
     # Run Runtime tests against CMB service
     - .yamato/_run-all.yml#run_all_project_tests_cmb_service
     # Run code coverage test
-    - .yamato/code-coverage.yml#code_coverage_ubuntu_trunk
+    - .yamato/code-coverage.yml#code_coverage_ubuntu_{{ validation_editors.default }}

.yamato/cmb-service-standalone-tests.yml

@@ -54,7 +54,7 @@ cmb_service_standalone_test_{{ project.name }}_{{ platform.name }}_{{ backend }}
 
   commands:
     # run_cmb_service.sh builds and starts a release version of the full CMB service (along with the limited echo server)
-    - ./Tools/CI/service.cmb/run_cmb_service.sh -e $ECHO_SERVER_PORT -s $CMB_SERVICE_PORT
+    - ./Tools/CI/service.cmb/run_cmb_service.sh -e $ECHO_SERVER_PORT -s $CMB_SERVICE_PORT -l artifacts
 
     - unity-downloader-cli --fast --wait -u {{ editor }} -c Editor {% if backend == "il2cpp" %} -c il2cpp {% endif %} {% if platform.name == "mac" %} --arch arm64 {% endif %} # For macOS we use ARM64 models
     - UnifiedTestRunner --suite=playmode --player-load-path=build/players --artifacts-path=test-results --testproject={{ project.path }} --editor-location=.Editor --playergraphicsapi=Null --fail-on-assert --rerun-strategy=Test --retry={{ num_test_retries }} --clean-library-on-rerun --timeout={{ test_timeout }}

.yamato/console-standalone-test.yml

@@ -45,7 +45,7 @@ console_standalone_build_{{ project.name }}_{{ platform.name }}_{{ editor }}:
   agent:
     type: {{ platform.type }}
     image: {{ platform.image }}
-    flavor: {{ platform.flavor }}
+    flavor: {{ platform.larger_flavor }}
 {% 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 %}

.yamato/desktop-standalone-tests.yml

@@ -38,7 +38,7 @@ desktop_standalone_build_{{ project.name }}_{{ platform.name }}_{{ backend }}_{{
   agent:
     type: {% if platform.name == "mac" %} {{ platform.type }} {% else %} {{ platform.type }} {% endif %}
     image: {{ platform.image }}
-    flavor: {{ platform.flavor }}
+    flavor: {{ platform.larger_flavor }}
 {% if platform.name == "mac" %}
     model: {{ platform.model }} # This is set only in platforms where we want non-default model to use (more information in project.metafile)
 {% endif %}

.yamato/generated-scripts/infrastructure-instability-detection-linux.sh

@@ -13,8 +13,8 @@ if [ -d "infrastructure_instability_detection_standalone" ]; then
   rm -rf "infrastructure_instability_detection_standalone" || true
 fi
 
-echo "downloading and extracting infrastructure_instability_detection_standalone@1.0.0"
-curl -fs "https://artifactory-slo.bf.unity3d.com/artifactory/automation-and-tooling/infrastructure-instability-detection/standalone/1.0.0/ubuntu.zip" --output "infrastructure_instability_detection_standalone.zip" --retry 5 || true
+echo "downloading and extracting infrastructure_instability_detection_standalone@1.2.2"
+curl -fs "https://artifactory-slo.bf.unity3d.com/artifactory/automation-and-tooling/infrastructure-instability-detection/standalone/1.2.2/ubuntu.zip" --output "infrastructure_instability_detection_standalone.zip" --retry 5 || true
 
 if [ -d "infrastructure_instability_detection" ]; then
   echo "removing infrastructure_instability_detection folder to avoid name clash"

.yamato/generated-scripts/infrastructure-instability-detection-mac.sh

@@ -13,8 +13,8 @@ if [ -d "infrastructure_instability_detection_standalone" ]; then
   rm -rf "infrastructure_instability_detection_standalone" || true
 fi
 
-echo "downloading and extracting infrastructure_instability_detection_standalone@1.0.0"
-curl -fs "https://artifactory-slo.bf.unity3d.com/artifactory/automation-and-tooling/infrastructure-instability-detection/standalone/1.0.0/macos.zip" --output "infrastructure_instability_detection_standalone.zip" --retry 5 || true
+echo "downloading and extracting infrastructure_instability_detection_standalone@1.2.2"
+curl -fs "https://artifactory-slo.bf.unity3d.com/artifactory/automation-and-tooling/infrastructure-instability-detection/standalone/1.2.2/macos.zip" --output "infrastructure_instability_detection_standalone.zip" --retry 5 || true
 
 if [ -d "infrastructure_instability_detection" ]; then
   echo "removing infrastructure_instability_detection folder to avoid name clash"