From b945b8e9a76977bafc9e4db3baca7e98d567adee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Chrobot?= Date: Sun, 12 Jul 2026 12:38:38 +0200 Subject: [PATCH 1/2] Updated CI deps --- .yamato/project.metafile | 6 +++--- .yamato/wrench/api-validation-jobs.yml | 4 ++-- .yamato/wrench/package-pack-jobs.yml | 2 +- .yamato/wrench/preview-a-p-v.yml | 14 +++++++------- .yamato/wrench/promotion-jobs.yml | 8 ++++---- .yamato/wrench/recipe-regeneration.yml | 2 +- .yamato/wrench/validation-jobs.yml | 12 ++++++------ .yamato/wrench/wrench_config.json | 2 +- Tools/CI/NGO.Cookbook.csproj | 10 +++++----- .../Packages/manifest.json | 4 ++-- 10 files changed, 32 insertions(+), 32 deletions(-) diff --git a/.yamato/project.metafile b/.yamato/project.metafile index 0dbc457da3..4e9053f2be 100644 --- a/.yamato/project.metafile +++ b/.yamato/project.metafile @@ -23,7 +23,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 @@ -38,13 +38,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.medium standalone: StandaloneLinux64 diff --git a/.yamato/wrench/api-validation-jobs.yml b/.yamato/wrench/api-validation-jobs.yml index 1b9106d777..611902cc9a 100644 --- a/.yamato/wrench/api-validation-jobs.yml +++ b/.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 diff --git a/.yamato/wrench/package-pack-jobs.yml b/.yamato/wrench/package-pack-jobs.yml index fec8ec8847..a40678465b 100644 --- a/.yamato/wrench/package-pack-jobs.yml +++ b/.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 diff --git a/.yamato/wrench/preview-a-p-v.yml b/.yamato/wrench/preview-a-p-v.yml index 15ef42849b..c1b89385eb 100644 --- a/.yamato/wrench/preview-a-p-v.yml +++ b/.yamato/wrench/preview-a-p-v.yml @@ -15,7 +15,7 @@ all_preview_apv_jobs: - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_0_-_win10 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 3.2.0.0 + Wrench: 3.2.1.0 # Functional tests for dependents found in the latest 6000.0 manifest (MacOS). preview_apv_-_6000_0_-_macos13: @@ -70,10 +70,10 @@ preview_apv_-_6000_0_-_macos13: 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 # Functional tests for dependents found in the latest 6000.0 manifest (Ubuntu). preview_apv_-_6000_0_-_ubuntu2204: @@ -128,10 +128,10 @@ preview_apv_-_6000_0_-_ubuntu2204: 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 # Functional tests for dependents found in the latest 6000.0 manifest (Windows). preview_apv_-_6000_0_-_win10: @@ -187,8 +187,8 @@ preview_apv_-_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 diff --git a/.yamato/wrench/promotion-jobs.yml b/.yamato/wrench/promotion-jobs.yml index 2182edc21c..0a17a207b8 100644 --- a/.yamato/wrench/promotion-jobs.yml +++ b/.yamato/wrench/promotion-jobs.yml @@ -63,10 +63,10 @@ publish_dry_run_netcode_gameobjects: unzip: true variables: UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - 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 # Publish for netcode.gameobjects to https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-npm publish_netcode_gameobjects: @@ -125,9 +125,9 @@ publish_netcode_gameobjects: unzip: true variables: UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 3.2.0.0 + UPMPVP_CONTEXT_WRENCH: 3.2.1.0 allow_on: branch match "^release/.*" metadata: Job Maintainers: '#rm-packageworks' - Wrench: 3.2.0.0 + Wrench: 3.2.1.0 diff --git a/.yamato/wrench/recipe-regeneration.yml b/.yamato/wrench/recipe-regeneration.yml index 34d5f02642..343a1a9b85 100644 --- a/.yamato/wrench/recipe-regeneration.yml +++ b/.yamato/wrench/recipe-regeneration.yml @@ -31,5 +31,5 @@ test_-_wrench_jobs_up_to_date: cancel_old_ci: true metadata: Job Maintainers: '#rm-packageworks' - Wrench: 3.2.0.0 + Wrench: 3.2.1.0 diff --git a/.yamato/wrench/validation-jobs.yml b/.yamato/wrench/validation-jobs.yml index 447028d827..86a8f7f524 100644 --- a/.yamato/wrench/validation-jobs.yml +++ b/.yamato/wrench/validation-jobs.yml @@ -69,10 +69,10 @@ validate_-_netcode_gameobjects_-_6000_0_-_macos13: UNITY_LICENSING_SERVER_DELETE_ULF: 0 UNITY_LICENSING_SERVER_TOOLSET: pro UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - 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 labels: - Packages:netcode.gameobjects @@ -139,10 +139,10 @@ validate_-_netcode_gameobjects_-_6000_0_-_ubuntu2204: UNITY_LICENSING_SERVER_DELETE_ULF: 0 UNITY_LICENSING_SERVER_TOOLSET: pro UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - 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 labels: - Packages:netcode.gameobjects @@ -209,10 +209,10 @@ validate_-_netcode_gameobjects_-_6000_0_-_win10: UNITY_LICENSING_SERVER_DELETE_ULF: 0 UNITY_LICENSING_SERVER_TOOLSET: pro UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - 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 labels: - Packages:netcode.gameobjects diff --git a/.yamato/wrench/wrench_config.json b/.yamato/wrench/wrench_config.json index 461e63a9ad..90268aa69b 100644 --- a/.yamato/wrench/wrench_config.json +++ b/.yamato/wrench/wrench_config.json @@ -39,7 +39,7 @@ }, "publishing_job": ".yamato/wrench/promotion-jobs.yml#publish_netcode_gameobjects", "branch_pattern": "ReleaseSlash", - "wrench_version": "3.2.0.0", + "wrench_version": "3.2.1.0", "pvp_exemption_path": ".yamato/wrench/pvp-exemptions.json", "cs_project_path": "Tools/CI/NGO.Cookbook.csproj" } \ No newline at end of file diff --git a/Tools/CI/NGO.Cookbook.csproj b/Tools/CI/NGO.Cookbook.csproj index ef0ba3d3bc..e47057e13d 100644 --- a/Tools/CI/NGO.Cookbook.csproj +++ b/Tools/CI/NGO.Cookbook.csproj @@ -8,11 +8,11 @@ - - - - - + + + + + diff --git a/testproject-tools-integration/Packages/manifest.json b/testproject-tools-integration/Packages/manifest.json index 5297101770..d8e0043777 100644 --- a/testproject-tools-integration/Packages/manifest.json +++ b/testproject-tools-integration/Packages/manifest.json @@ -3,10 +3,10 @@ "dependencies": { "com.unity.ide.rider": "3.0.40", "com.unity.multiplayer.center": "1.0.0", - "com.unity.multiplayer.tools": "2.2.8", + "com.unity.multiplayer.tools": "2.2.9", "com.unity.netcode.gameobjects": "file:../../com.unity.netcode.gameobjects", "com.unity.test-framework": "1.6.0", - "com.unity.test-framework.performance": "3.4.2", + "com.unity.test-framework.performance": "3.5.0", "com.unity.transport": "2.7.3", "com.unity.modules.accessibility": "1.0.0", "com.unity.modules.ai": "1.0.0", From c10c6ce2569e070681bf4bd69f7ccb55b812496e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Chrobot?= Date: Sun, 12 Jul 2026 12:39:44 +0200 Subject: [PATCH 2/2] Removed unused configurations --- .github/renovate.json5 | 38 -------------------------------------- .yamato/project.metafile | 12 ------------ 2 files changed, 50 deletions(-) delete mode 100644 .github/renovate.json5 diff --git a/.github/renovate.json5 b/.github/renovate.json5 deleted file mode 100644 index 923b574eed..0000000000 --- a/.github/renovate.json5 +++ /dev/null @@ -1,38 +0,0 @@ -{ - "baseBranches": ["develop", "develop-2.0.0"], - "dependencyDashboard": true, - - "$schema": "https://docs.renovatebot.com/renovate-schema.json", - "extends": [ - "local>Unity-Technologies/unity-renovate-config" - ], - "prConcurrentLimit": 100, - // Ignore commits produced by GitHub actions workflows - "gitIgnoredAuthors": ["githubaction@githubaction.com"], - "ignorePaths": [ - "**/node_modules/**", - // Don't renovate files in special folders using ~ as suffix - "**/*~/**", - "com.unity.netcode.gameobjects/**/*", - "testproject/**/*", - "minimalproject/**/*", - "testproject-tools-integration/**/*", - "Examples/**/*" - ], - "packageRules": [ - - // Run unity-upm-project and unity-upm-package only on weekends to reduce PR noise - // Also ensure dependencies won't be downgraded when they don't exist in the public repositories - { - "matchManagers": [ - "unity-upm-project", - "unity-upm-package" - ], - "enabled": "true", - "schedule": [ - "every weekend" - ], - "rollbackPrs": false, - } - ], -} diff --git a/.yamato/project.metafile b/.yamato/project.metafile index 4e9053f2be..ae0d8f54e9 100644 --- a/.yamato/project.metafile +++ b/.yamato/project.metafile @@ -62,7 +62,6 @@ test_platforms: standalone: StandaloneOSX model: M1 # The default model (an x64 Intel Mac VM) quite often caused a known issue of doing all the bitflips in packages resulting in failures # For mobile devices there is a split between the build and run phase so there is a need of splitting specification for both - # TODO: For android we could consider adding ARM64 configuration mobile_build: - name: android type: Unity::VM @@ -102,11 +101,6 @@ test_platforms: image: package-ci/win10-ps4:v4 flavor: b1.large standalone: PS4 - # - name: ps5 --> SEE MTT-12118 - # type: Unity::VM - # image: package-ci/win10-ps5:v4 - # flavor: b1.large - # standalone: PS5 - name: switch type: Unity::VM image: package-ci/win10-switch:v4 @@ -128,11 +122,6 @@ test_platforms: image: package-ci/win10-ps4:v4 flavor: b1.large standalone: PS4 - #- name: ps5 --> SEE MTT-12118 - # type: Unity::console::ps5 - # image: package-ci/win10-ps5:v4 - # flavor: b1.large - # standalone: PS5 - name: switch type: Unity::console::switch image: package-ci/win10-switch:v4 @@ -152,7 +141,6 @@ test_platforms: # EDITOR CONFIGURATIONS------------------------------------------------------------------------------- # Editors to be used for testing. NGOv1.X official support started from 2021.3 editor -# TODO: When a new editor will be released it should be added to this list. Correct also if we will stop supporting one of the editors present here validation_editor: - 6000.0