Merge branch 'develop-2.0.0' into fix/in-scene-placed-edge-cases

Author: EmandM

.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/pr-description-validation.yml

@@ -21,7 +21,7 @@ jobs:
     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

.github/workflows/pr-supervisor.yaml

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

.yamato/_triggers.yml

@@ -89,6 +89,8 @@ pr_code_changes_checks:
     # Note that our daily tests will anyway run both test configurations in "minimal supported" and "trunk" configurations
     - .yamato/desktop-standalone-tests.yml#desktop_standalone_test_testproject_ubuntu_il2cpp_{{ pinnedTrunk }}
     - .yamato/cmb-service-standalone-tests.yml#cmb_service_standalone_test_testproject_ubuntu_il2cpp_{{ pinnedTrunk }}
+    # Run code coverage test
+    - .yamato/code-coverage.yml#code_coverage_ubuntu_{{ validation_editors.default }}
   triggers:
     expression: |-
       (pull_request.comment eq "ngo" OR

.yamato/project.metafile

@@ -24,7 +24,7 @@
 small_agent_platform:
     - name: ubuntu
       type: Unity::VM
-      image: package-ci/ubuntu-22.04:v4.86.0
+      image: package-ci/ubuntu-22.04:v4.87.0
       flavor: b1.small
 
 
@@ -39,13 +39,13 @@ test_platforms:
     default:
         - name: ubuntu
           type: Unity::VM
-          image: package-ci/ubuntu-22.04:v4.86.0
+          image: package-ci/ubuntu-22.04:v4.87.0
           flavor: b1.large
           standalone: StandaloneLinux64
     desktop:
         - name: ubuntu
           type: Unity::VM
-          image: package-ci/ubuntu-22.04:v4.86.0
+          image: package-ci/ubuntu-22.04:v4.87.0
           flavor: b1.large
           smaller_flavor: b1.large
           larger_flavor: b1.xlarge
@@ -117,12 +117,17 @@ test_platforms:
         #  flavor: b1.large
         #  larger_flavor: b1.xlarge
         #  standalone: PS5
-        - name: switch
-          type: Unity::VM
-          image: package-ci/win10-switch:v4
-          flavor: b1.large
-          larger_flavor: b1.xlarge
-          standalone: Switch
+        # - name: switch --> TEMPORARILY DISABLED. SEE MTT-12118
+        #   The NintendoSDK on the win10-switch:v4 Bokken image is incomplete for the SDK
+        #   version the newer editor Playback Engines require: 18_3_0 is missing the
+        #   nintendo-switch-support lib the new toolchain links against, and 21_4_3 is missing the
+        #   Tools\Graphics\NvnTools (GraphicsConverter) libraries needed to package textures.
+        #   Neither is fixable from .yamato; re-enable once Package CI ships a complete SDK on the image.
+        #   type: Unity::VM
+        #   image: package-ci/win10-switch:v4
+        #   flavor: b1.large
+        #   larger_flavor: b1.xlarge
+        #   standalone: Switch
         - name: GameCoreXboxOne
           type: Unity::VM
           image: package-ci/win10-xbox:v4
@@ -148,13 +153,13 @@ test_platforms:
         #  flavor: b1.large
         #  larger_flavor: b1.xlarge
         #  standalone: PS5
-        - name: switch
-          type: Unity::console::switch
-          image: package-ci/win10-switch:v4
-          flavor: b1.large
-          larger_flavor: b1.xlarge
-          standalone: Switch
-          base: win
+        # - name: switch --> TEMPORARILY DISABLED. SEE MTT-12118 (incomplete NintendoSDK on win10-switch:v4 image)
+        #   type: Unity::console::switch
+        #   image: package-ci/win10-switch:v4
+        #   flavor: b1.large
+        #   larger_flavor: b1.xlarge
+        #   standalone: Switch
+        #   base: win
         - name: GameCoreXboxOne
           type: Unity::console::xbox
           image: package-ci/win10-xbox:v4
@@ -181,10 +186,10 @@ validation_editors:
         - 6000.5
         - 6000.6
         - trunk
-        - f1298548e194f35ff7dfa6fee699d4464ab3919c
+        - 5fe7931aab8c4fff9274e15ef0800125c68b8d6a
     minimal:
         - 6000.0
-pinnedTrunk:  f1298548e194f35ff7dfa6fee699d4464ab3919c
+pinnedTrunk:  5fe7931aab8c4fff9274e15ef0800125c68b8d6a
 
 
 # Scripting backends used by Standalone RunTimeTests---------------------------------------------------

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

@@ -60,8 +60,8 @@ api_validation_-_netcode_gameobjects_-_6000_0_-_win10:
     UNITY_LICENSING_SERVER_DELETE_NUL: 0
     UNITY_LICENSING_SERVER_DELETE_ULF: 0
     UNITY_LICENSING_SERVER_TOOLSET: pro
-    UPMPVP_CONTEXT_WRENCH: 3.2.0.0
+    UPMPVP_CONTEXT_WRENCH: 3.2.1.0
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 3.2.0.0
+    Wrench: 3.2.1.0
 

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

@@ -29,5 +29,5 @@ package_pack_-_netcode_gameobjects:
     UPMCI_ACK_LARGE_PACKAGE: 1
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 3.2.0.0
+    Wrench: 3.2.1.0