Merge branch 'develop-2.0.0' into experimental/v3-x-x/hybrid_spawn_integration_tests-fixes-develop-2-0-0-merge

Author: NoelStephensUnity

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

@@ -24,7 +24,7 @@ jobs:
         uses: actions/checkout@v6
 
       - name: Check PR description
-        uses: actions/github-script@v8
+        uses: actions/github-script@v9
         with:
           script: |
             const pr = context.payload.pull_request;

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

@@ -23,7 +23,7 @@ jobs:
     steps:
 
       - name: 'Assign QA Team'
-        uses: actions/github-script@v8
+        uses: actions/github-script@v9
         with:
           github-token: ${{ secrets.GH_TOKEN }}
           script: |

.yamato/_triggers.yml

@@ -75,20 +75,20 @@ pr_code_changes_checks:
     # Run API validation to early-detect all new APIs that would force us to release new minor version of the package. Note that for this to work the package version in package.json must correspond to "actual package state" which means that it should be higher than last released version
     - .yamato/vetting-test.yml#vetting_test
 
-    # Run package EditMode and Playmode package tests on 6000.5 and an older supported editor (6000.0)
-    - .yamato/package-tests.yml#package_test_-_ngo_6000.5_mac
+    # Run package EditMode and Playmode package tests on trunk and an older supported editor (6000.0)
+    - .yamato/package-tests.yml#package_test_-_ngo_trunk_mac
     - .yamato/package-tests.yml#package_test_-_ngo_6000.0_win
 
-    # Run testproject EditMode and Playmode project tests on 6000.5 and an older supported editor (6000.0)
-    - .yamato/project-tests.yml#test_testproject_win_6000.5
+    # Run testproject EditMode and Playmode project tests on trunk and an older supported editor (6000.0)
+    - .yamato/project-tests.yml#test_testproject_win_trunk
     - .yamato/project-tests.yml#test_testproject_mac_6000.0
 
     # Run standalone test. We run it only on Ubuntu since it's the fastest machine, and it was noted that for example distribution on macOS is taking 40m since we switched to Apple Silicon
     # 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 "6000.5" configurations
-    - .yamato/desktop-standalone-tests.yml#desktop_standalone_test_testproject_ubuntu_il2cpp_6000.5
-    - .yamato/cmb-service-standalone-tests.yml#cmb_service_standalone_test_testproject_ubuntu_il2cpp_6000.5
+    # 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_trunk
+    - .yamato/cmb-service-standalone-tests.yml#cmb_service_standalone_test_testproject_ubuntu_il2cpp_trunk
   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.82.0
+      image: package-ci/ubuntu-22.04:v4.83.0
       flavor: b1.small
 
 
@@ -39,13 +39,13 @@ test_platforms:
     default:
         - name: ubuntu
           type: Unity::VM
-          image: package-ci/ubuntu-22.04:v4.82.0
+          image: package-ci/ubuntu-22.04:v4.83.0
           flavor: b1.large
           standalone: StandaloneLinux64
     desktop:
         - name: ubuntu
           type: Unity::VM
-          image: package-ci/ubuntu-22.04:v4.82.0
+          image: package-ci/ubuntu-22.04:v4.83.0
           flavor: b1.large
           smaller_flavor: b1.medium
           larger_flavor: b1.xlarge

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

@@ -3,6 +3,7 @@
 ###  Auto-generated by Recipe Engine, DO NOT EDIT.  ###
 ###                                                 ###
 #######################################################
+# Source: RecipeEngine.Modules.Wrench.Recipes.ApiValidationJobs
 # This job is generated by the wrench recipe engine module, see find the docs here: http://Go/ii2fb
 all_api_validation_jobs:
   name: All API Validation Jobs
@@ -17,7 +18,7 @@ api_validation_-_netcode_gameobjects_-_6000_0_-_win10:
     type: Unity::VM
     flavor: b1.large
   commands:
-  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.zip -o wrench-localapv.zip
+  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-3_51b4e6affb4c10b90f92db9551b9dc80c5520794983600cff4fa925111db116d.zip -o wrench-localapv.zip
   - command: 7z x -aoa wrench-localapv.zip
   - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple
   - command: python PythonScripts/print_machine_info.py
@@ -59,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: 2.3.3.0
+    UPMPVP_CONTEXT_WRENCH: 2.7.0.0
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 2.3.3.0
+    Wrench: 2.7.0.0
 

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

@@ -3,6 +3,7 @@
 ###  Auto-generated by Recipe Engine, DO NOT EDIT.  ###
 ###                                                 ###
 #######################################################
+# Source: RecipeEngine.Modules.Wrench.Recipes.PackagePackJobs
 # This job is generated by the wrench recipe engine module, see find the docs here: http://Go/ii2fb
 
 # Pack Netcode for GameObjects
@@ -28,5 +29,5 @@ package_pack_-_netcode_gameobjects:
     UPMCI_ACK_LARGE_PACKAGE: 1
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 2.3.3.0
+    Wrench: 2.7.0.0
 

.yamato/wrench/player-build.yml

@@ -3,6 +3,7 @@
 ###  Auto-generated by Recipe Engine, DO NOT EDIT.  ###
 ###                                                 ###
 #######################################################
+# Source: RecipeEngine.Modules.Wrench.Recipes.PlayerBuild
 # This job is generated by the wrench recipe engine module, see find the docs here: http://Go/ii2fb
 {}
 

.yamato/wrench/player-test.yml

@@ -3,6 +3,7 @@
 ###  Auto-generated by Recipe Engine, DO NOT EDIT.  ###
 ###                                                 ###
 #######################################################
+# Source: RecipeEngine.Modules.Wrench.Recipes.PlayerTest
 # This job is generated by the wrench recipe engine module, see find the docs here: http://Go/ii2fb
 {}