diff --git a/.yamato/wrench/api-validation-jobs.yml b/.yamato/wrench/api-validation-jobs.yml index 112f6661b4..c8a89327cd 100644 --- a/.yamato/wrench/api-validation-jobs.yml +++ b/.yamato/wrench/api-validation-jobs.yml @@ -60,8 +60,8 @@ api_validation_-_netcode_gameobjects_-_2022_3_-_win10: UNITY_LICENSING_SERVER_DELETE_NUL: 0 UNITY_LICENSING_SERVER_DELETE_ULF: 0 UNITY_LICENSING_SERVER_TOOLSET: pro - UPMPVP_CONTEXT_WRENCH: 2.5.0.0 + UPMPVP_CONTEXT_WRENCH: 2.6.0.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 2.5.0.0 + Wrench: 2.6.0.0 diff --git a/.yamato/wrench/package-pack-jobs.yml b/.yamato/wrench/package-pack-jobs.yml index b63cba9414..3f790ebca4 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: 2.5.0.0 + Wrench: 2.6.0.0 diff --git a/.yamato/wrench/preview-a-p-v.yml b/.yamato/wrench/preview-a-p-v.yml index 12f42f00ca..f75445f49b 100644 --- a/.yamato/wrench/preview-a-p-v.yml +++ b/.yamato/wrench/preview-a-p-v.yml @@ -18,7 +18,7 @@ all_preview_apv_jobs: - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_0_-_win10 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 2.5.0.0 + Wrench: 2.6.0.0 # Functional tests for dependents found in the latest 2022.3 manifest (MacOS). preview_apv_-_2022_3_-_macos13: @@ -73,10 +73,10 @@ preview_apv_-_2022_3_-_macos13: UNITY_LICENSING_SERVER_DELETE_NUL: 0 UNITY_LICENSING_SERVER_DELETE_ULF: 0 UNITY_LICENSING_SERVER_TOOLSET: pro - UPMPVP_CONTEXT_WRENCH: 2.5.0.0 + UPMPVP_CONTEXT_WRENCH: 2.6.0.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 2.5.0.0 + Wrench: 2.6.0.0 # Functional tests for dependents found in the latest 2022.3 manifest (Ubuntu). preview_apv_-_2022_3_-_ubuntu1804: @@ -131,10 +131,10 @@ preview_apv_-_2022_3_-_ubuntu1804: UNITY_LICENSING_SERVER_DELETE_NUL: 0 UNITY_LICENSING_SERVER_DELETE_ULF: 0 UNITY_LICENSING_SERVER_TOOLSET: pro - UPMPVP_CONTEXT_WRENCH: 2.5.0.0 + UPMPVP_CONTEXT_WRENCH: 2.6.0.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 2.5.0.0 + Wrench: 2.6.0.0 # Functional tests for dependents found in the latest 2022.3 manifest (Windows). preview_apv_-_2022_3_-_win10: @@ -190,10 +190,10 @@ preview_apv_-_2022_3_-_win10: UNITY_LICENSING_SERVER_DELETE_NUL: 0 UNITY_LICENSING_SERVER_DELETE_ULF: 0 UNITY_LICENSING_SERVER_TOOLSET: pro - UPMPVP_CONTEXT_WRENCH: 2.5.0.0 + UPMPVP_CONTEXT_WRENCH: 2.6.0.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 2.5.0.0 + Wrench: 2.6.0.0 # Functional tests for dependents found in the latest 6000.0 manifest (MacOS). preview_apv_-_6000_0_-_macos13: @@ -248,10 +248,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: 2.5.0.0 + UPMPVP_CONTEXT_WRENCH: 2.6.0.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 2.5.0.0 + Wrench: 2.6.0.0 # Functional tests for dependents found in the latest 6000.0 manifest (Ubuntu). preview_apv_-_6000_0_-_ubuntu2204: @@ -306,10 +306,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: 2.5.0.0 + UPMPVP_CONTEXT_WRENCH: 2.6.0.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 2.5.0.0 + Wrench: 2.6.0.0 # Functional tests for dependents found in the latest 6000.0 manifest (Windows). preview_apv_-_6000_0_-_win10: @@ -365,8 +365,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: 2.5.0.0 + UPMPVP_CONTEXT_WRENCH: 2.6.0.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 2.5.0.0 + Wrench: 2.6.0.0 diff --git a/.yamato/wrench/promotion-jobs.yml b/.yamato/wrench/promotion-jobs.yml index 7843c0be16..6d01a03194 100644 --- a/.yamato/wrench/promotion-jobs.yml +++ b/.yamato/wrench/promotion-jobs.yml @@ -93,10 +93,10 @@ publish_dry_run_netcode_gameobjects: unzip: true variables: UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 2.5.0.0 + UPMPVP_CONTEXT_WRENCH: 2.6.0.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 2.5.0.0 + Wrench: 2.6.0.0 # Publish for netcode.gameobjects to https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-npm publish_netcode_gameobjects: @@ -185,8 +185,8 @@ publish_netcode_gameobjects: unzip: true variables: UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 2.5.0.0 + UPMPVP_CONTEXT_WRENCH: 2.6.0.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 2.5.0.0 + Wrench: 2.6.0.0 diff --git a/.yamato/wrench/recipe-regeneration.yml b/.yamato/wrench/recipe-regeneration.yml index df8c11e776..47cbacbdab 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: 2.5.0.0 + Wrench: 2.6.0.0 diff --git a/.yamato/wrench/validation-jobs.yml b/.yamato/wrench/validation-jobs.yml index 05de34e1c9..28cdaa4aba 100644 --- a/.yamato/wrench/validation-jobs.yml +++ b/.yamato/wrench/validation-jobs.yml @@ -19,7 +19,7 @@ validate_-_netcode_gameobjects_-_2022_3_-_macos13: - 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 - command: unity-downloader-cli -u 2022.3/staging -c editor --path .Editor --fast - timeout: 10 + timeout: 20 retries: 3 - command: upm-pvp create-test-project testproject --packages "upm-ci~/packages/*.tgz" --filter "com.unity.netcode.gameobjects com.unity.netcode.gameobjects.tests" --unity .Editor timeout: 10 @@ -69,10 +69,10 @@ validate_-_netcode_gameobjects_-_2022_3_-_macos13: UNITY_LICENSING_SERVER_DELETE_ULF: 0 UNITY_LICENSING_SERVER_TOOLSET: pro UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 2.5.0.0 + UPMPVP_CONTEXT_WRENCH: 2.6.0.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 2.5.0.0 + Wrench: 2.6.0.0 labels: - Packages:netcode.gameobjects @@ -89,7 +89,7 @@ validate_-_netcode_gameobjects_-_2022_3_-_ubuntu1804: - 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 - command: unity-downloader-cli -u 2022.3/staging -c editor --path .Editor --fast - timeout: 10 + timeout: 20 retries: 3 - command: upm-pvp create-test-project testproject --packages "upm-ci~/packages/*.tgz" --filter "com.unity.netcode.gameobjects com.unity.netcode.gameobjects.tests" --unity .Editor timeout: 10 @@ -139,10 +139,10 @@ validate_-_netcode_gameobjects_-_2022_3_-_ubuntu1804: UNITY_LICENSING_SERVER_DELETE_ULF: 0 UNITY_LICENSING_SERVER_TOOLSET: pro UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 2.5.0.0 + UPMPVP_CONTEXT_WRENCH: 2.6.0.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 2.5.0.0 + Wrench: 2.6.0.0 labels: - Packages:netcode.gameobjects @@ -159,7 +159,7 @@ validate_-_netcode_gameobjects_-_2022_3_-_win10: - 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 - command: unity-downloader-cli -u 2022.3/staging -c editor --path .Editor --fast - timeout: 10 + timeout: 20 retries: 3 - command: upm-pvp create-test-project testproject --packages "upm-ci~/packages/*.tgz" --filter "com.unity.netcode.gameobjects com.unity.netcode.gameobjects.tests" --unity .Editor timeout: 10 @@ -209,10 +209,10 @@ validate_-_netcode_gameobjects_-_2022_3_-_win10: UNITY_LICENSING_SERVER_DELETE_ULF: 0 UNITY_LICENSING_SERVER_TOOLSET: pro UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 2.5.0.0 + UPMPVP_CONTEXT_WRENCH: 2.6.0.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 2.5.0.0 + Wrench: 2.6.0.0 labels: - Packages:netcode.gameobjects @@ -229,7 +229,7 @@ validate_-_netcode_gameobjects_-_6000_0_-_macos13: - 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 - command: unity-downloader-cli -u 6000.0/staging -c editor --path .Editor --fast - timeout: 10 + timeout: 20 retries: 3 - command: upm-pvp create-test-project testproject --packages "upm-ci~/packages/*.tgz" --filter "com.unity.netcode.gameobjects com.unity.netcode.gameobjects.tests" --unity .Editor timeout: 10 @@ -279,10 +279,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: 2.5.0.0 + UPMPVP_CONTEXT_WRENCH: 2.6.0.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 2.5.0.0 + Wrench: 2.6.0.0 labels: - Packages:netcode.gameobjects @@ -299,7 +299,7 @@ validate_-_netcode_gameobjects_-_6000_0_-_ubuntu2204: - 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 - command: unity-downloader-cli -u 6000.0/staging -c editor --path .Editor --fast - timeout: 10 + timeout: 20 retries: 3 - command: upm-pvp create-test-project testproject --packages "upm-ci~/packages/*.tgz" --filter "com.unity.netcode.gameobjects com.unity.netcode.gameobjects.tests" --unity .Editor timeout: 10 @@ -349,10 +349,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: 2.5.0.0 + UPMPVP_CONTEXT_WRENCH: 2.6.0.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 2.5.0.0 + Wrench: 2.6.0.0 labels: - Packages:netcode.gameobjects @@ -369,7 +369,7 @@ validate_-_netcode_gameobjects_-_6000_0_-_win10: - 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 - command: unity-downloader-cli -u 6000.0/staging -c editor --path .Editor --fast - timeout: 10 + timeout: 20 retries: 3 - command: upm-pvp create-test-project testproject --packages "upm-ci~/packages/*.tgz" --filter "com.unity.netcode.gameobjects com.unity.netcode.gameobjects.tests" --unity .Editor timeout: 10 @@ -419,10 +419,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: 2.5.0.0 + UPMPVP_CONTEXT_WRENCH: 2.6.0.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 2.5.0.0 + Wrench: 2.6.0.0 labels: - Packages:netcode.gameobjects diff --git a/.yamato/wrench/wrench_config.json b/.yamato/wrench/wrench_config.json index 83a3498d47..9d7a0c1b7e 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": "2.5.0.0", + "wrench_version": "2.6.0.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 52bb92c863..4ea6830169 100644 --- a/Tools/CI/NGO.Cookbook.csproj +++ b/Tools/CI/NGO.Cookbook.csproj @@ -12,7 +12,7 @@ - +