diff --git a/.github/workflows/pr-description-validation.yml b/.github/workflows/pr-description-validation.yml index c5a727ffdb..7117e3cf58 100644 --- a/.github/workflows/pr-description-validation.yml +++ b/.github/workflows/pr-description-validation.yml @@ -21,7 +21,7 @@ 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 diff --git a/.github/workflows/pr-supervisor.yaml b/.github/workflows/pr-supervisor.yaml index fe0ebbd6d7..ba8da21e93 100644 --- a/.github/workflows/pr-supervisor.yaml +++ b/.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: diff --git a/.yamato/_run-all.yml b/.yamato/_run-all.yml index effe65098a..b62d4ae8a3 100644 --- a/.yamato/_run-all.yml +++ b/.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 diff --git a/.yamato/_triggers.yml b/.yamato/_triggers.yml index 72145210c2..d51d6b3940 100644 --- a/.yamato/_triggers.yml +++ b/.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: |- @@ -128,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 @@ -188,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 }} diff --git a/.yamato/code-coverage.yml b/.yamato/code-coverage.yml index caeeff72ec..0233fedb1d 100644 --- a/.yamato/code-coverage.yml +++ b/.yamato/code-coverage.yml @@ -36,6 +36,8 @@ code_coverage_{{ platform.name }}_{{ editor }}: {% 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 %} + variables: + UTR_VERSION: {{ utr_version }} commands: - unity-downloader-cli --fast --wait -u {{ editor }} -c Editor {% if platform.name == "mac" %} --arch arm64 {% endif %} # For macOS we use ARM64 models - upm-pvp create-test-project test-project --packages "upm-ci~/packages/*.tgz" --unity .Editor diff --git a/.yamato/project-tests.yml b/.yamato/project-tests.yml index e00c832fe1..cea3cb5689 100644 --- a/.yamato/project-tests.yml +++ b/.yamato/project-tests.yml @@ -36,6 +36,8 @@ test_{{ project.name }}_{{ platform.name }}_{{ editor }}: {% 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 %} + variables: + UTR_VERSION: {{ utr_version }} commands: - unity-downloader-cli --fast --wait -u {{ editor }} -c Editor {% if platform.name == "mac" %} --arch arm64 {% endif %} # For macOS we use ARM64 models. Installing basic editor for tests execution - UnifiedTestRunner --testproject={{ project.path }} --suite=editor --suite=playmode --artifacts-path=test-results --editor-location=.Editor --rerun-strategy=Test --retry={{ num_test_retries }} --clean-library-on-rerun --timeout={{ test_timeout }} diff --git a/.yamato/project.metafile b/.yamato/project.metafile index f434d36106..0b849d5c0f 100644 --- a/.yamato/project.metafile +++ b/.yamato/project.metafile @@ -16,7 +16,6 @@ # base --> Indicates the base operating system for build operations (e.g., win, mac) # architecture --> Specifies the target CPU architecture (e.g., armv7, arm64) - # SMALL AGENT CONFIGURATION--------------------------------------------------------------------------------------------------- # The small agent was created to handle jobs that don't involve running Unity and are in general super light when it comes to resource usage (for example pack job). # It uses ubuntu since Linux VMs are faster and cheaper to provision than Mac or Windows Virtual Machines (VMs). @@ -84,6 +83,7 @@ test_platforms: type: Unity::VM::osx image: package-ci/macos-13:v4 flavor: m1.mac + larger_flavor: m1.mac standalone: IOS base: mac architecture: arm64 @@ -175,10 +175,9 @@ test_platforms: validation_editors: default: - - trunk + - 6000.3 all: - 6000.0 - - 6000.2 - 6000.3 - 6000.4 - trunk @@ -214,6 +213,7 @@ projects: # UNIFIED TEST RUNNER CONFIGURATIONS-------------------------------------------------------------------- # Shared settings for the UnifiedTestRunner +utr_version: 1.46.0 # Configures the number of times a failed test is retried before it is considered failed. # Helps handle flaky tests diff --git a/.yamato/wrench/api-validation-jobs.yml b/.yamato/wrench/api-validation-jobs.yml index 7d2f8e91a1..bd270aba08 100644 --- a/.yamato/wrench/api-validation-jobs.yml +++ b/.yamato/wrench/api-validation-jobs.yml @@ -51,8 +51,12 @@ api_validation_-_netcode_gameobjects_-_6000_0_-_windows: dependencies: - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects variables: - UPMPVP_CONTEXT_WRENCH: 1.3.0.0 + UNITY_LICENSING_SERVER_BASE_URL: http://unity-ci-licenses.hq.unity3d.com:8080/ + UNITY_LICENSING_SERVER_DELETE_NUL: 0 + UNITY_LICENSING_SERVER_DELETE_ULF: 0 + UNITY_LICENSING_SERVER_TOOLSET: pro + UPMPVP_CONTEXT_WRENCH: 1.4.5.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 1.3.0.0 + Wrench: 1.4.5.0 diff --git a/.yamato/wrench/package-pack-jobs.yml b/.yamato/wrench/package-pack-jobs.yml index 8084a10442..d5cf51d5c3 100644 --- a/.yamato/wrench/package-pack-jobs.yml +++ b/.yamato/wrench/package-pack-jobs.yml @@ -24,5 +24,5 @@ package_pack_-_netcode_gameobjects: UPMCI_ACK_LARGE_PACKAGE: 1 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 1.3.0.0 + Wrench: 1.4.5.0 diff --git a/.yamato/wrench/preview-a-p-v.yml b/.yamato/wrench/preview-a-p-v.yml index cfc62cc793..7f584de5c6 100644 --- a/.yamato/wrench/preview-a-p-v.yml +++ b/.yamato/wrench/preview-a-p-v.yml @@ -19,7 +19,7 @@ all_preview_apv_jobs: - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_5_-_windows metadata: Job Maintainers: '#rm-packageworks' - Wrench: 1.3.0.0 + Wrench: 1.4.5.0 # Functional tests for dependents found in the latest 6000.0 manifest (MacOS). preview_apv_-_6000_0_-_macos: @@ -70,10 +70,14 @@ preview_apv_-_6000_0_-_macos: dependencies: - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects variables: - UPMPVP_CONTEXT_WRENCH: 1.3.0.0 + UNITY_LICENSING_SERVER_BASE_URL: http://unity-ci-licenses.hq.unity3d.com:8080/ + UNITY_LICENSING_SERVER_DELETE_NUL: 0 + UNITY_LICENSING_SERVER_DELETE_ULF: 0 + UNITY_LICENSING_SERVER_TOOLSET: pro + UPMPVP_CONTEXT_WRENCH: 1.4.5.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 1.3.0.0 + Wrench: 1.4.5.0 # Functional tests for dependents found in the latest 6000.0 manifest (Ubuntu). preview_apv_-_6000_0_-_ubuntu: @@ -124,10 +128,14 @@ preview_apv_-_6000_0_-_ubuntu: dependencies: - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects variables: - UPMPVP_CONTEXT_WRENCH: 1.3.0.0 + UNITY_LICENSING_SERVER_BASE_URL: http://unity-ci-licenses.hq.unity3d.com:8080/ + UNITY_LICENSING_SERVER_DELETE_NUL: 0 + UNITY_LICENSING_SERVER_DELETE_ULF: 0 + UNITY_LICENSING_SERVER_TOOLSET: pro + UPMPVP_CONTEXT_WRENCH: 1.4.5.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 1.3.0.0 + Wrench: 1.4.5.0 # Functional tests for dependents found in the latest 6000.0 manifest (Windows). preview_apv_-_6000_0_-_windows: @@ -179,10 +187,14 @@ preview_apv_-_6000_0_-_windows: dependencies: - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects variables: - UPMPVP_CONTEXT_WRENCH: 1.3.0.0 + UNITY_LICENSING_SERVER_BASE_URL: http://unity-ci-licenses.hq.unity3d.com:8080/ + UNITY_LICENSING_SERVER_DELETE_NUL: 0 + UNITY_LICENSING_SERVER_DELETE_ULF: 0 + UNITY_LICENSING_SERVER_TOOLSET: pro + UPMPVP_CONTEXT_WRENCH: 1.4.5.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 1.3.0.0 + Wrench: 1.4.5.0 # Functional tests for dependents found in the latest 6000.3 manifest (MacOS). preview_apv_-_6000_3_-_macos: @@ -233,10 +245,14 @@ preview_apv_-_6000_3_-_macos: dependencies: - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects variables: - UPMPVP_CONTEXT_WRENCH: 1.3.0.0 + UNITY_LICENSING_SERVER_BASE_URL: http://unity-ci-licenses.hq.unity3d.com:8080/ + UNITY_LICENSING_SERVER_DELETE_NUL: 0 + UNITY_LICENSING_SERVER_DELETE_ULF: 0 + UNITY_LICENSING_SERVER_TOOLSET: pro + UPMPVP_CONTEXT_WRENCH: 1.4.5.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 1.3.0.0 + Wrench: 1.4.5.0 # Functional tests for dependents found in the latest 6000.3 manifest (Ubuntu). preview_apv_-_6000_3_-_ubuntu: @@ -287,10 +303,14 @@ preview_apv_-_6000_3_-_ubuntu: dependencies: - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects variables: - UPMPVP_CONTEXT_WRENCH: 1.3.0.0 + UNITY_LICENSING_SERVER_BASE_URL: http://unity-ci-licenses.hq.unity3d.com:8080/ + UNITY_LICENSING_SERVER_DELETE_NUL: 0 + UNITY_LICENSING_SERVER_DELETE_ULF: 0 + UNITY_LICENSING_SERVER_TOOLSET: pro + UPMPVP_CONTEXT_WRENCH: 1.4.5.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 1.3.0.0 + Wrench: 1.4.5.0 # Functional tests for dependents found in the latest 6000.3 manifest (Windows). preview_apv_-_6000_3_-_windows: @@ -342,10 +362,14 @@ preview_apv_-_6000_3_-_windows: dependencies: - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects variables: - UPMPVP_CONTEXT_WRENCH: 1.3.0.0 + UNITY_LICENSING_SERVER_BASE_URL: http://unity-ci-licenses.hq.unity3d.com:8080/ + UNITY_LICENSING_SERVER_DELETE_NUL: 0 + UNITY_LICENSING_SERVER_DELETE_ULF: 0 + UNITY_LICENSING_SERVER_TOOLSET: pro + UPMPVP_CONTEXT_WRENCH: 1.4.5.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 1.3.0.0 + Wrench: 1.4.5.0 # Functional tests for dependents found in the latest 6000.4 manifest (MacOS). preview_apv_-_6000_4_-_macos: @@ -396,10 +420,14 @@ preview_apv_-_6000_4_-_macos: dependencies: - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects variables: - UPMPVP_CONTEXT_WRENCH: 1.3.0.0 + UNITY_LICENSING_SERVER_BASE_URL: http://unity-ci-licenses.hq.unity3d.com:8080/ + UNITY_LICENSING_SERVER_DELETE_NUL: 0 + UNITY_LICENSING_SERVER_DELETE_ULF: 0 + UNITY_LICENSING_SERVER_TOOLSET: pro + UPMPVP_CONTEXT_WRENCH: 1.4.5.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 1.3.0.0 + Wrench: 1.4.5.0 # Functional tests for dependents found in the latest 6000.4 manifest (Ubuntu). preview_apv_-_6000_4_-_ubuntu: @@ -450,10 +478,14 @@ preview_apv_-_6000_4_-_ubuntu: dependencies: - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects variables: - UPMPVP_CONTEXT_WRENCH: 1.3.0.0 + UNITY_LICENSING_SERVER_BASE_URL: http://unity-ci-licenses.hq.unity3d.com:8080/ + UNITY_LICENSING_SERVER_DELETE_NUL: 0 + UNITY_LICENSING_SERVER_DELETE_ULF: 0 + UNITY_LICENSING_SERVER_TOOLSET: pro + UPMPVP_CONTEXT_WRENCH: 1.4.5.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 1.3.0.0 + Wrench: 1.4.5.0 # Functional tests for dependents found in the latest 6000.4 manifest (Windows). preview_apv_-_6000_4_-_windows: @@ -505,10 +537,14 @@ preview_apv_-_6000_4_-_windows: dependencies: - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects variables: - UPMPVP_CONTEXT_WRENCH: 1.3.0.0 + UNITY_LICENSING_SERVER_BASE_URL: http://unity-ci-licenses.hq.unity3d.com:8080/ + UNITY_LICENSING_SERVER_DELETE_NUL: 0 + UNITY_LICENSING_SERVER_DELETE_ULF: 0 + UNITY_LICENSING_SERVER_TOOLSET: pro + UPMPVP_CONTEXT_WRENCH: 1.4.5.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 1.3.0.0 + Wrench: 1.4.5.0 # Functional tests for dependents found in the latest 6000.5 manifest (MacOS). preview_apv_-_6000_5_-_macos: @@ -559,10 +595,14 @@ preview_apv_-_6000_5_-_macos: dependencies: - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects variables: - UPMPVP_CONTEXT_WRENCH: 1.3.0.0 + UNITY_LICENSING_SERVER_BASE_URL: http://unity-ci-licenses.hq.unity3d.com:8080/ + UNITY_LICENSING_SERVER_DELETE_NUL: 0 + UNITY_LICENSING_SERVER_DELETE_ULF: 0 + UNITY_LICENSING_SERVER_TOOLSET: pro + UPMPVP_CONTEXT_WRENCH: 1.4.5.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 1.3.0.0 + Wrench: 1.4.5.0 # Functional tests for dependents found in the latest 6000.5 manifest (Ubuntu). preview_apv_-_6000_5_-_ubuntu: @@ -613,10 +653,14 @@ preview_apv_-_6000_5_-_ubuntu: dependencies: - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects variables: - UPMPVP_CONTEXT_WRENCH: 1.3.0.0 + UNITY_LICENSING_SERVER_BASE_URL: http://unity-ci-licenses.hq.unity3d.com:8080/ + UNITY_LICENSING_SERVER_DELETE_NUL: 0 + UNITY_LICENSING_SERVER_DELETE_ULF: 0 + UNITY_LICENSING_SERVER_TOOLSET: pro + UPMPVP_CONTEXT_WRENCH: 1.4.5.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 1.3.0.0 + Wrench: 1.4.5.0 # Functional tests for dependents found in the latest 6000.5 manifest (Windows). preview_apv_-_6000_5_-_windows: @@ -668,8 +712,12 @@ preview_apv_-_6000_5_-_windows: dependencies: - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects variables: - UPMPVP_CONTEXT_WRENCH: 1.3.0.0 + UNITY_LICENSING_SERVER_BASE_URL: http://unity-ci-licenses.hq.unity3d.com:8080/ + UNITY_LICENSING_SERVER_DELETE_NUL: 0 + UNITY_LICENSING_SERVER_DELETE_ULF: 0 + UNITY_LICENSING_SERVER_TOOLSET: pro + UPMPVP_CONTEXT_WRENCH: 1.4.5.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 1.3.0.0 + Wrench: 1.4.5.0 diff --git a/.yamato/wrench/promotion-jobs.yml b/.yamato/wrench/promotion-jobs.yml index 495e3e5795..51475a1326 100644 --- a/.yamato/wrench/promotion-jobs.yml +++ b/.yamato/wrench/promotion-jobs.yml @@ -148,10 +148,10 @@ publish_dry_run_netcode_gameobjects: ignore_artifact: true variables: UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 1.3.0.0 + UPMPVP_CONTEXT_WRENCH: 1.4.5.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 1.3.0.0 + Wrench: 1.4.5.0 # Publish for netcode.gameobjects to https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-npm publish_netcode_gameobjects: @@ -300,8 +300,8 @@ publish_netcode_gameobjects: ignore_artifact: true variables: UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 1.3.0.0 + UPMPVP_CONTEXT_WRENCH: 1.4.5.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 1.3.0.0 + Wrench: 1.4.5.0 diff --git a/.yamato/wrench/recipe-regeneration.yml b/.yamato/wrench/recipe-regeneration.yml index a7957c6503..ca380ea535 100644 --- a/.yamato/wrench/recipe-regeneration.yml +++ b/.yamato/wrench/recipe-regeneration.yml @@ -26,5 +26,5 @@ test_-_wrench_jobs_up_to_date: cancel_old_ci: true metadata: Job Maintainers: '#rm-packageworks' - Wrench: 1.3.0.0 + Wrench: 1.4.5.0 diff --git a/.yamato/wrench/validation-jobs.yml b/.yamato/wrench/validation-jobs.yml index cf252acd3d..7f2ca32ef6 100644 --- a/.yamato/wrench/validation-jobs.yml +++ b/.yamato/wrench/validation-jobs.yml @@ -59,11 +59,15 @@ validate_-_netcode_gameobjects_-_6000_0_-_macos: dependencies: - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects variables: + UNITY_LICENSING_SERVER_BASE_URL: http://unity-ci-licenses.hq.unity3d.com:8080/ + UNITY_LICENSING_SERVER_DELETE_NUL: 0 + UNITY_LICENSING_SERVER_DELETE_ULF: 0 + UNITY_LICENSING_SERVER_TOOLSET: pro UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 1.3.0.0 + UPMPVP_CONTEXT_WRENCH: 1.4.5.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 1.3.0.0 + Wrench: 1.4.5.0 labels: - Packages:netcode.gameobjects @@ -125,11 +129,15 @@ validate_-_netcode_gameobjects_-_6000_0_-_ubuntu: dependencies: - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects variables: + UNITY_LICENSING_SERVER_BASE_URL: http://unity-ci-licenses.hq.unity3d.com:8080/ + UNITY_LICENSING_SERVER_DELETE_NUL: 0 + UNITY_LICENSING_SERVER_DELETE_ULF: 0 + UNITY_LICENSING_SERVER_TOOLSET: pro UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 1.3.0.0 + UPMPVP_CONTEXT_WRENCH: 1.4.5.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 1.3.0.0 + Wrench: 1.4.5.0 labels: - Packages:netcode.gameobjects @@ -191,11 +199,15 @@ validate_-_netcode_gameobjects_-_6000_0_-_windows: dependencies: - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects variables: + UNITY_LICENSING_SERVER_BASE_URL: http://unity-ci-licenses.hq.unity3d.com:8080/ + UNITY_LICENSING_SERVER_DELETE_NUL: 0 + UNITY_LICENSING_SERVER_DELETE_ULF: 0 + UNITY_LICENSING_SERVER_TOOLSET: pro UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 1.3.0.0 + UPMPVP_CONTEXT_WRENCH: 1.4.5.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 1.3.0.0 + Wrench: 1.4.5.0 labels: - Packages:netcode.gameobjects @@ -257,11 +269,15 @@ validate_-_netcode_gameobjects_-_6000_3_-_macos: dependencies: - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects variables: + UNITY_LICENSING_SERVER_BASE_URL: http://unity-ci-licenses.hq.unity3d.com:8080/ + UNITY_LICENSING_SERVER_DELETE_NUL: 0 + UNITY_LICENSING_SERVER_DELETE_ULF: 0 + UNITY_LICENSING_SERVER_TOOLSET: pro UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 1.3.0.0 + UPMPVP_CONTEXT_WRENCH: 1.4.5.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 1.3.0.0 + Wrench: 1.4.5.0 labels: - Packages:netcode.gameobjects @@ -323,11 +339,15 @@ validate_-_netcode_gameobjects_-_6000_3_-_ubuntu: dependencies: - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects variables: + UNITY_LICENSING_SERVER_BASE_URL: http://unity-ci-licenses.hq.unity3d.com:8080/ + UNITY_LICENSING_SERVER_DELETE_NUL: 0 + UNITY_LICENSING_SERVER_DELETE_ULF: 0 + UNITY_LICENSING_SERVER_TOOLSET: pro UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 1.3.0.0 + UPMPVP_CONTEXT_WRENCH: 1.4.5.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 1.3.0.0 + Wrench: 1.4.5.0 labels: - Packages:netcode.gameobjects @@ -389,11 +409,15 @@ validate_-_netcode_gameobjects_-_6000_3_-_windows: dependencies: - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects variables: + UNITY_LICENSING_SERVER_BASE_URL: http://unity-ci-licenses.hq.unity3d.com:8080/ + UNITY_LICENSING_SERVER_DELETE_NUL: 0 + UNITY_LICENSING_SERVER_DELETE_ULF: 0 + UNITY_LICENSING_SERVER_TOOLSET: pro UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 1.3.0.0 + UPMPVP_CONTEXT_WRENCH: 1.4.5.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 1.3.0.0 + Wrench: 1.4.5.0 labels: - Packages:netcode.gameobjects @@ -455,11 +479,15 @@ validate_-_netcode_gameobjects_-_6000_4_-_macos: dependencies: - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects variables: + UNITY_LICENSING_SERVER_BASE_URL: http://unity-ci-licenses.hq.unity3d.com:8080/ + UNITY_LICENSING_SERVER_DELETE_NUL: 0 + UNITY_LICENSING_SERVER_DELETE_ULF: 0 + UNITY_LICENSING_SERVER_TOOLSET: pro UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 1.3.0.0 + UPMPVP_CONTEXT_WRENCH: 1.4.5.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 1.3.0.0 + Wrench: 1.4.5.0 labels: - Packages:netcode.gameobjects @@ -521,11 +549,15 @@ validate_-_netcode_gameobjects_-_6000_4_-_ubuntu: dependencies: - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects variables: + UNITY_LICENSING_SERVER_BASE_URL: http://unity-ci-licenses.hq.unity3d.com:8080/ + UNITY_LICENSING_SERVER_DELETE_NUL: 0 + UNITY_LICENSING_SERVER_DELETE_ULF: 0 + UNITY_LICENSING_SERVER_TOOLSET: pro UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 1.3.0.0 + UPMPVP_CONTEXT_WRENCH: 1.4.5.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 1.3.0.0 + Wrench: 1.4.5.0 labels: - Packages:netcode.gameobjects @@ -587,11 +619,15 @@ validate_-_netcode_gameobjects_-_6000_4_-_windows: dependencies: - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects variables: + UNITY_LICENSING_SERVER_BASE_URL: http://unity-ci-licenses.hq.unity3d.com:8080/ + UNITY_LICENSING_SERVER_DELETE_NUL: 0 + UNITY_LICENSING_SERVER_DELETE_ULF: 0 + UNITY_LICENSING_SERVER_TOOLSET: pro UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 1.3.0.0 + UPMPVP_CONTEXT_WRENCH: 1.4.5.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 1.3.0.0 + Wrench: 1.4.5.0 labels: - Packages:netcode.gameobjects @@ -653,11 +689,15 @@ validate_-_netcode_gameobjects_-_6000_5_-_macos: dependencies: - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects variables: + UNITY_LICENSING_SERVER_BASE_URL: http://unity-ci-licenses.hq.unity3d.com:8080/ + UNITY_LICENSING_SERVER_DELETE_NUL: 0 + UNITY_LICENSING_SERVER_DELETE_ULF: 0 + UNITY_LICENSING_SERVER_TOOLSET: pro UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 1.3.0.0 + UPMPVP_CONTEXT_WRENCH: 1.4.5.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 1.3.0.0 + Wrench: 1.4.5.0 labels: - Packages:netcode.gameobjects @@ -719,11 +759,15 @@ validate_-_netcode_gameobjects_-_6000_5_-_ubuntu: dependencies: - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects variables: + UNITY_LICENSING_SERVER_BASE_URL: http://unity-ci-licenses.hq.unity3d.com:8080/ + UNITY_LICENSING_SERVER_DELETE_NUL: 0 + UNITY_LICENSING_SERVER_DELETE_ULF: 0 + UNITY_LICENSING_SERVER_TOOLSET: pro UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 1.3.0.0 + UPMPVP_CONTEXT_WRENCH: 1.4.5.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 1.3.0.0 + Wrench: 1.4.5.0 labels: - Packages:netcode.gameobjects @@ -785,11 +829,15 @@ validate_-_netcode_gameobjects_-_6000_5_-_windows: dependencies: - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects variables: + UNITY_LICENSING_SERVER_BASE_URL: http://unity-ci-licenses.hq.unity3d.com:8080/ + UNITY_LICENSING_SERVER_DELETE_NUL: 0 + UNITY_LICENSING_SERVER_DELETE_ULF: 0 + UNITY_LICENSING_SERVER_TOOLSET: pro UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 1.3.0.0 + UPMPVP_CONTEXT_WRENCH: 1.4.5.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 1.3.0.0 + Wrench: 1.4.5.0 labels: - Packages:netcode.gameobjects diff --git a/.yamato/wrench/wrench_config.json b/.yamato/wrench/wrench_config.json index b9906524ed..c0a89c3b01 100644 --- a/.yamato/wrench/wrench_config.json +++ b/.yamato/wrench/wrench_config.json @@ -16,7 +16,8 @@ "coverageCommands": [ "generateAdditionalMetrics;generateHtmlReport;assemblyFilters:ASSEMBLY_NAME;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:YAMATO_SOURCE_DIR/Packages;" ], - "dependantsToIgnoreInPreviewApv": {} + "dependantsToIgnoreInPreviewApv": {}, + "postPackCommands": [] } }, "releasing_packages": [ @@ -24,14 +25,14 @@ ], "jobs_to_monitor": { "com.unity.netcode.gameobjects": [ - ".yamato/wrench/api-validation-jobs.yml#api_validation_-_netcode_gameobjects_-_6000_0_-_windows", - ".yamato/wrench/preview-a-p-v.yml#all_preview_apv_jobs", - ".yamato/wrench/promotion-jobs.yml#publish_dry_run_netcode_gameobjects" + ".yamato\\wrench/api-validation-jobs.yml#api_validation_-_netcode_gameobjects_-_6000_0_-_windows", + ".yamato\\wrench/preview-a-p-v.yml#all_preview_apv_jobs", + ".yamato\\wrench/promotion-jobs.yml#publish_dry_run_netcode_gameobjects" ] }, - "publishing_job": ".yamato/wrench/promotion-jobs.yml#publish_netcode_gameobjects", + "publishing_job": ".yamato\\wrench/promotion-jobs.yml#publish_netcode_gameobjects", "branch_pattern": "ReleaseSlash", - "wrench_version": "1.3.0.0", + "wrench_version": "1.4.5.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 5d4626bbf1..144ebedd13 100644 --- a/Tools/CI/NGO.Cookbook.csproj +++ b/Tools/CI/NGO.Cookbook.csproj @@ -8,11 +8,11 @@ - - - + + + - + diff --git a/Tools/scripts/ReleaseAutomation/release_config.py b/Tools/scripts/ReleaseAutomation/release_config.py index b91f6201d4..6a7217ed50 100644 --- a/Tools/scripts/ReleaseAutomation/release_config.py +++ b/Tools/scripts/ReleaseAutomation/release_config.py @@ -85,7 +85,7 @@ def __init__(self): { "key": "BURST_ON_OFF", "value": "on" }, { "key": "PLATFORM_WIN64_MAC_ANDROID", "value": "win64" }, { "key": "SCRIPTING_BACKEND_IL2CPP_MONO", "value": "il2cpp" }, - { "key": "UNITY_VERSION", "value": "6000.2" } # Editor that most our users will use (not alpha). Sometimes when testing on trunk we have weird editor issues not caused by us so the preference will be to test on latest editor that our users will use. + { "key": "UNITY_VERSION", "value": "6000.3" } # Editor that most our users will use (not alpha). Sometimes when testing on trunk we have weird editor issues not caused by us so the preference will be to test on latest editor that our users will use. ] }, { @@ -112,7 +112,7 @@ def __init__(self): { "key": "BURST_ON_OFF", "value": "off" }, { "key": "PLATFORM_WIN64_MAC_ANDROID", "value": "mac" }, { "key": "SCRIPTING_BACKEND_IL2CPP_MONO", "value": "mono" }, - { "key": "UNITY_VERSION", "value": "6000.2" } # Editor that most our users will use (not alpha). Sometimes when testing on trunk we have weird editor issues not caused by us so the preference will be to test on latest editor that our users will use. + { "key": "UNITY_VERSION", "value": "6000.3" } # Editor that most our users will use (not alpha). Sometimes when testing on trunk we have weird editor issues not caused by us so the preference will be to test on latest editor that our users will use. ] }, { @@ -139,7 +139,7 @@ def __init__(self): { "key": "BURST_ON_OFF", "value": "on" }, { "key": "PLATFORM_WIN64_MAC_ANDROID", "value": "android" }, { "key": "SCRIPTING_BACKEND_IL2CPP_MONO", "value": "il2cpp" }, - { "key": "UNITY_VERSION", "value": "6000.2" } # Editor that most our users will use (not alpha). Sometimes when testing on trunk we have weird editor issues not caused by us so the preference will be to test on latest editor that our users will use. + { "key": "UNITY_VERSION", "value": "6000.3" } # Editor that most our users will use (not alpha). Sometimes when testing on trunk we have weird editor issues not caused by us so the preference will be to test on latest editor that our users will use. ] }, { diff --git a/com.unity.netcode.gameobjects/Runtime/Core/NetworkBehaviour.cs b/com.unity.netcode.gameobjects/Runtime/Core/NetworkBehaviour.cs index 9910668f59..81a2aa03a1 100644 --- a/com.unity.netcode.gameobjects/Runtime/Core/NetworkBehaviour.cs +++ b/com.unity.netcode.gameobjects/Runtime/Core/NetworkBehaviour.cs @@ -1,8 +1,10 @@ +#pragma warning disable IDE0005 using System; using System.Collections.Generic; using System.Runtime.CompilerServices; using Unity.Collections; using UnityEngine; +#pragma warning restore IDE0005 namespace Unity.Netcode { diff --git a/com.unity.netcode.gameobjects/Runtime/HelpUrls.cs b/com.unity.netcode.gameobjects/Runtime/HelpUrls.cs index 5e17c0d267..b45145805e 100644 --- a/com.unity.netcode.gameobjects/Runtime/HelpUrls.cs +++ b/com.unity.netcode.gameobjects/Runtime/HelpUrls.cs @@ -11,7 +11,7 @@ internal static class HelpUrls public const string NetworkObject = BaseManualUrl + "components/core/networkobject.html"; public const string NetworkAnimator = BaseManualUrl + "components/helper/networkanimator.html"; public const string NetworkRigidbody = BaseManualUrl + "components/helper/networkrigidbody.html"; - public const string NetworkRigidbody2D = BaseManualUrl + "components/helper/networkrigidbody.html"; + public const string NetworkRigidbody2D = BaseManualUrl + "components/helper/networkrigidbody.html#networkrigidbody2d"; public const string RigidbodyContactEventManager = BaseApiUrl + ".Components.RigidbodyContactEventManager.html"; public const string NetworkTransform = BaseManualUrl + "components/helper/networktransform.html"; public const string AnticipatedNetworkTransform = BaseManualUrl + "advanced-topics/client-anticipation.html"; diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/NetworkObject/NetworkObjectSynchronizationTests.cs b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkObject/NetworkObjectSynchronizationTests.cs index 934eb68188..2ca041fa7e 100644 --- a/com.unity.netcode.gameobjects/Tests/Runtime/NetworkObject/NetworkObjectSynchronizationTests.cs +++ b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkObject/NetworkObjectSynchronizationTests.cs @@ -9,6 +9,7 @@ namespace Unity.Netcode.RuntimeTests { + [UnityPlatform(exclude = new[] { RuntimePlatform.IPhonePlayer })] // Ignored test tracked in MTT-14172 [TestFixture(VariableLengthSafety.DisableNetVarSafety, HostOrServer.DAHost)] [TestFixture(VariableLengthSafety.DisableNetVarSafety, HostOrServer.Host)] [TestFixture(VariableLengthSafety.EnabledNetVarSafety, HostOrServer.Host)]