From 2694e2bdd3dbd4cb3ed1a2026e9dd9c7266e1b93 Mon Sep 17 00:00:00 2001 From: michalChrobot Date: Tue, 5 Aug 2025 16:52:37 +0200 Subject: [PATCH 1/4] Moved Build Automation out of CI folder --- .yamato/project-builders/project-builders.yml | 12 ++++++------ .../scripts/BuildAutomation/BuilderScripts.cs | 0 Tools/{CI => }/scripts/BuildAutomation/FileCopy.py | 4 ++-- .../BuildAutomation/Unity.ProjectBuild.Editor.asmdef | 0 .../scripts/BuildAutomation/connect_services.py | 0 .../scripts/BuildAutomation/disable-enable-burst.py | 0 .../scripts/BuildAutomation/manifest_update.py | 0 .../scripts/BuildAutomation/validate_params.py | 0 8 files changed, 8 insertions(+), 8 deletions(-) rename Tools/{CI => }/scripts/BuildAutomation/BuilderScripts.cs (100%) rename Tools/{CI => }/scripts/BuildAutomation/FileCopy.py (91%) rename Tools/{CI => }/scripts/BuildAutomation/Unity.ProjectBuild.Editor.asmdef (100%) rename Tools/{CI => }/scripts/BuildAutomation/connect_services.py (100%) rename Tools/{CI => }/scripts/BuildAutomation/disable-enable-burst.py (100%) rename Tools/{CI => }/scripts/BuildAutomation/manifest_update.py (100%) rename Tools/{CI => }/scripts/BuildAutomation/validate_params.py (100%) diff --git a/.yamato/project-builders/project-builders.yml b/.yamato/project-builders/project-builders.yml index 54fff4e0ec..bb463d9526 100644 --- a/.yamato/project-builders/project-builders.yml +++ b/.yamato/project-builders/project-builders.yml @@ -32,22 +32,22 @@ build_{{ netcodeProject[0] }}_project: PLATFORM_WIN64_MAC_ANDROID: win64 commands: # Validate inputs passed via Yamato variables - - python Tools/CI/scripts/BuildAutomation/validate_params.py + - python Tools/scripts/BuildAutomation/validate_params.py - echo Building {{ netcodeProject[0] }} project with Unity version of %UNITY_VERSION%, Scripting backend %SCRIPTING_BACKEND_IL2CPP_MONO%, Burst %BURST_ON_OFF% for platform %PLATFORM_WIN64_MAC_ANDROID% # Clone the external project repository into a specific directory. Notice that branch is also specified. - git clone --single-branch --branch {{ netcodeProject[1].branch }} {{ netcodeProject[1].GithubRepo }} C:/ClonedProject # Modify the external project's manifest to use the local N4E package from current branch on which this Yamato job is running. (requires python that should be preinstalled in the image) - - python Tools/CI/scripts/BuildAutomation/manifest_update.py --manifest-path C:/ClonedProject/{{ netcodeProject[1].manifestPath }} --local-package-path %YAMATO_SOURCE_DIR%/com.unity.netcode.gameobjects + - python Tools/scripts/BuildAutomation/manifest_update.py --manifest-path C:/ClonedProject/{{ netcodeProject[1].manifestPath }} --local-package-path %YAMATO_SOURCE_DIR%/com.unity.netcode.gameobjects # Run python script to update ProjectSettings.asset in order to connect the project to Unity Services/set proper values. # Notice that if a project has this already set up then in theory we don't need to run this script. - - python Tools/CI/scripts/BuildAutomation/connect_services.py --project-settings-path C:/ClonedProject/{{ netcodeProject[1].projectPath }}/ProjectSettings/ProjectSettings.asset + - python Tools/scripts/BuildAutomation/connect_services.py --project-settings-path C:/ClonedProject/{{ netcodeProject[1].projectPath }}/ProjectSettings/ProjectSettings.asset # Enable or disable Burst compilation. This step is specific to Netcode package (or any package that uses Burst) - - IF "%BURST_ON_OFF%"=="on" (python Tools/CI/scripts/BuildAutomation/disable-enable-burst.py --enable-burst --project-path C:/ClonedProject/{{ netcodeProject[1].projectPath }}) - ELSE (python Tools/CI/scripts/BuildAutomation/disable-enable-burst.py --disable-burst --project-path C:/ClonedProject/{{ netcodeProject[1].projectPath }}) + - IF "%BURST_ON_OFF%"=="on" (python Tools/scripts/BuildAutomation/disable-enable-burst.py --enable-burst --project-path C:/ClonedProject/{{ netcodeProject[1].projectPath }}) + ELSE (python Tools/scripts/BuildAutomation/disable-enable-burst.py --disable-burst --project-path C:/ClonedProject/{{ netcodeProject[1].projectPath }}) # Download the Unity Editor version specified in the UNITY_VERSION variable. Il2cpp component is downloaded only if the SCRIPTING_BACKEND_IL2CPP_MONO is set to "il2cpp". # TODO: we could download components only if needed @@ -56,7 +56,7 @@ build_{{ netcodeProject[0] }}_project: # Add BuilderScript.cs to the project so we can modify and build the project using Unity Editor. # This is a bit tricky step, notice that we also need to include proper assembly definition in order for those scripts to compile properly. # TODO: the asmdef file can be simplified - - python Tools/CI/scripts/BuildAutomation/FileCopy.py "C:/ClonedProject/{{ netcodeProject[1].projectPath }}" + - python Tools/scripts/BuildAutomation/FileCopy.py "C:/ClonedProject/{{ netcodeProject[1].projectPath }}" # Build the project using Unity Editor. This will call the given static BuilderScripts method. # Ideally, it would be nice to parametrize the BuilderScripts (for example to pass scripting backend as parameter) but -executeMethod only calls static methods without parameters so for now we will have multiple configurations diff --git a/Tools/CI/scripts/BuildAutomation/BuilderScripts.cs b/Tools/scripts/BuildAutomation/BuilderScripts.cs similarity index 100% rename from Tools/CI/scripts/BuildAutomation/BuilderScripts.cs rename to Tools/scripts/BuildAutomation/BuilderScripts.cs diff --git a/Tools/CI/scripts/BuildAutomation/FileCopy.py b/Tools/scripts/BuildAutomation/FileCopy.py similarity index 91% rename from Tools/CI/scripts/BuildAutomation/FileCopy.py rename to Tools/scripts/BuildAutomation/FileCopy.py index 249c12f16c..5204fbb6b8 100644 --- a/Tools/CI/scripts/BuildAutomation/FileCopy.py +++ b/Tools/scripts/BuildAutomation/FileCopy.py @@ -21,8 +21,8 @@ def main(): target_dir = os.path.join(project_root, 'Assets', 'Scripts', 'Editor') # The source files for build automation - source_asmdef = 'Tools/CI/scripts/BuildAutomation/Unity.ProjectBuild.Editor.asmdef' - source_script = 'Tools/CI/scripts/BuildAutomation/BuilderScripts.cs' + source_asmdef = 'Tools/scripts/BuildAutomation/Unity.ProjectBuild.Editor.asmdef' + source_script = 'Tools/scripts/BuildAutomation/BuilderScripts.cs' print(f"Preparing build scripts for project at: {project_root}") print(f"Target editor script directory: {target_dir}") diff --git a/Tools/CI/scripts/BuildAutomation/Unity.ProjectBuild.Editor.asmdef b/Tools/scripts/BuildAutomation/Unity.ProjectBuild.Editor.asmdef similarity index 100% rename from Tools/CI/scripts/BuildAutomation/Unity.ProjectBuild.Editor.asmdef rename to Tools/scripts/BuildAutomation/Unity.ProjectBuild.Editor.asmdef diff --git a/Tools/CI/scripts/BuildAutomation/connect_services.py b/Tools/scripts/BuildAutomation/connect_services.py similarity index 100% rename from Tools/CI/scripts/BuildAutomation/connect_services.py rename to Tools/scripts/BuildAutomation/connect_services.py diff --git a/Tools/CI/scripts/BuildAutomation/disable-enable-burst.py b/Tools/scripts/BuildAutomation/disable-enable-burst.py similarity index 100% rename from Tools/CI/scripts/BuildAutomation/disable-enable-burst.py rename to Tools/scripts/BuildAutomation/disable-enable-burst.py diff --git a/Tools/CI/scripts/BuildAutomation/manifest_update.py b/Tools/scripts/BuildAutomation/manifest_update.py similarity index 100% rename from Tools/CI/scripts/BuildAutomation/manifest_update.py rename to Tools/scripts/BuildAutomation/manifest_update.py diff --git a/Tools/CI/scripts/BuildAutomation/validate_params.py b/Tools/scripts/BuildAutomation/validate_params.py similarity index 100% rename from Tools/CI/scripts/BuildAutomation/validate_params.py rename to Tools/scripts/BuildAutomation/validate_params.py From d732f0de78683ee190ae82fec3155057ac26e808 Mon Sep 17 00:00:00 2001 From: michalChrobot Date: Tue, 5 Aug 2025 16:53:14 +0200 Subject: [PATCH 2/4] Setting maximum supported editor --- .yamato/wrench/preview-a-p-v.yml | 166 ------------------------ .yamato/wrench/promotion-jobs.yml | 60 --------- .yamato/wrench/validation-jobs.yml | 198 ----------------------------- .yamato/wrench/wrench_config.json | 2 +- Tools/CI/Settings/NGOSettings.cs | 1 + 5 files changed, 2 insertions(+), 425 deletions(-) diff --git a/.yamato/wrench/preview-a-p-v.yml b/.yamato/wrench/preview-a-p-v.yml index 9e58f1ce3e..56aa78ff7a 100644 --- a/.yamato/wrench/preview-a-p-v.yml +++ b/.yamato/wrench/preview-a-p-v.yml @@ -20,9 +20,6 @@ all_preview_apv_jobs: - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_2_-_macos - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_2_-_ubuntu - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_2_-_windows - - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_3_-_macos - - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_3_-_ubuntu - - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_3_-_windows metadata: Job Maintainers: '#rm-packageworks' Wrench: 0.12.2.0 @@ -842,166 +839,3 @@ preview_apv_-_6000_2_-_windows: Job Maintainers: '#rm-packageworks' Wrench: 0.12.2.0 -# Functional tests for dependents found in the latest 6000.3 manifest (MacOS). -preview_apv_-_6000_3_-_macos: - name: Preview APV - 6000.3 - macos - agent: - image: package-ci/macos-13:default - type: Unity::VM::osx - flavor: b1.xlarge - commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-68_53c92d3b34ce3f4b652c9785dd1530bdc5885f6523465d6969c3be91f9ccaaf1.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 - - command: npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - timeout: 20 - retries: 10 - - command: unity-downloader-cli -u trunk -c editor --path .Editor --fast - timeout: 10 - retries: 3 - - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.3 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~ - - command: echo 'Skipping Editor Manifest Validator as it is only supported on Windows' - after: - - command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh - artifacts: - Crash Dumps: - paths: - - CrashDumps/** - logs: - paths: - - '*.log' - - '*.xml' - - upm-ci~/test-results/**/* - - upm-ci~/temp/*/Logs/** - - upm-ci~/temp/*/Library/*.log - - upm-ci~/temp/*/*.log - - upm-ci~/temp/Builds/*.log - packages: - paths: - - upm-ci~/packages/**/* - PreviewAPVResults: - paths: - - PreviewApvArtifacts~/** - - APVTest/**/manifest.json - pvp-results: - paths: - - upm-ci~/pvp/**/* - browsable: onDemand - dependencies: - - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects - variables: - UPMPVP_CONTEXT_WRENCH: 0.12.2.0 - metadata: - Job Maintainers: '#rm-packageworks' - Wrench: 0.12.2.0 - -# Functional tests for dependents found in the latest 6000.3 manifest (Ubuntu). -preview_apv_-_6000_3_-_ubuntu: - name: Preview APV - 6000.3 - ubuntu - agent: - image: package-ci/ubuntu-20.04:default - type: Unity::VM - flavor: b1.large - commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-68_53c92d3b34ce3f4b652c9785dd1530bdc5885f6523465d6969c3be91f9ccaaf1.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 - - command: npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - timeout: 20 - retries: 10 - - command: unity-downloader-cli -u trunk -c editor --path .Editor --fast - timeout: 10 - retries: 3 - - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.3 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~ - - command: echo 'Skipping Editor Manifest Validator as it is only supported on Windows' - after: - - command: bash .yamato/generated-scripts/infrastructure-instability-detection-linux.sh - artifacts: - Crash Dumps: - paths: - - CrashDumps/** - logs: - paths: - - '*.log' - - '*.xml' - - upm-ci~/test-results/**/* - - upm-ci~/temp/*/Logs/** - - upm-ci~/temp/*/Library/*.log - - upm-ci~/temp/*/*.log - - upm-ci~/temp/Builds/*.log - packages: - paths: - - upm-ci~/packages/**/* - PreviewAPVResults: - paths: - - PreviewApvArtifacts~/** - - APVTest/**/manifest.json - pvp-results: - paths: - - upm-ci~/pvp/**/* - browsable: onDemand - dependencies: - - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects - variables: - UPMPVP_CONTEXT_WRENCH: 0.12.2.0 - metadata: - Job Maintainers: '#rm-packageworks' - Wrench: 0.12.2.0 - -# Functional tests for dependents found in the latest 6000.3 manifest (Windows). -preview_apv_-_6000_3_-_windows: - name: Preview APV - 6000.3 - windows - agent: - image: package-ci/win10:default - type: Unity::VM - flavor: b1.large - commands: - - command: gsudo reg add "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\FileSystem" /v LongPathsEnabled /t REG_DWORD /d 1 /f - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-68_53c92d3b34ce3f4b652c9785dd1530bdc5885f6523465d6969c3be91f9ccaaf1.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 - - command: npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - timeout: 20 - retries: 10 - - command: unity-downloader-cli -u trunk -c editor --path .Editor --fast - timeout: 10 - retries: 3 - - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.3 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~ - - command: python PythonScripts/editor_manifest_validator.py --version=6000.3 --wrench-config=.yamato/wrench/wrench_config.json - after: - - command: .yamato\generated-scripts\infrastructure-instability-detection-win.cmd - artifacts: - Crash Dumps: - paths: - - CrashDumps/** - logs: - paths: - - '*.log' - - '*.xml' - - upm-ci~/test-results/**/* - - upm-ci~/temp/*/Logs/** - - upm-ci~/temp/*/Library/*.log - - upm-ci~/temp/*/*.log - - upm-ci~/temp/Builds/*.log - packages: - paths: - - upm-ci~/packages/**/* - PreviewAPVResults: - paths: - - PreviewApvArtifacts~/** - - APVTest/**/manifest.json - pvp-results: - paths: - - upm-ci~/pvp/**/* - browsable: onDemand - dependencies: - - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects - variables: - UPMPVP_CONTEXT_WRENCH: 0.12.2.0 - metadata: - Job Maintainers: '#rm-packageworks' - Wrench: 0.12.2.0 - diff --git a/.yamato/wrench/promotion-jobs.yml b/.yamato/wrench/promotion-jobs.yml index 6c2194ad01..84f9d29650 100644 --- a/.yamato/wrench/promotion-jobs.yml +++ b/.yamato/wrench/promotion-jobs.yml @@ -176,36 +176,6 @@ publish_dry_run_netcode_gameobjects: unzip: true packages: ignore_artifact: true - - path: .yamato/wrench/validation-jobs.yml#validate_-_netcode_gameobjects_-_6000_3_-_macos - specific_options: - UTR: - location: results/UTR/validate-netcode.gameobjects-6000.3-macos - unzip: true - pvp-results: - location: results/pvp/validate-netcode.gameobjects-6000.3-macos - unzip: true - packages: - ignore_artifact: true - - path: .yamato/wrench/validation-jobs.yml#validate_-_netcode_gameobjects_-_6000_3_-_ubuntu - specific_options: - UTR: - location: results/UTR/validate-netcode.gameobjects-6000.3-ubuntu - unzip: true - pvp-results: - location: results/pvp/validate-netcode.gameobjects-6000.3-ubuntu - unzip: true - packages: - ignore_artifact: true - - path: .yamato/wrench/validation-jobs.yml#validate_-_netcode_gameobjects_-_6000_3_-_windows - specific_options: - UTR: - location: results/UTR/validate-netcode.gameobjects-6000.3-windows - unzip: true - pvp-results: - location: results/pvp/validate-netcode.gameobjects-6000.3-windows - unzip: true - packages: - ignore_artifact: true variables: UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 UPMPVP_CONTEXT_WRENCH: 0.12.2.0 @@ -388,36 +358,6 @@ publish_netcode_gameobjects: unzip: true packages: ignore_artifact: true - - path: .yamato/wrench/validation-jobs.yml#validate_-_netcode_gameobjects_-_6000_3_-_macos - specific_options: - UTR: - location: results/UTR/validate-netcode.gameobjects-6000.3-macos - unzip: true - pvp-results: - location: results/pvp/validate-netcode.gameobjects-6000.3-macos - unzip: true - packages: - ignore_artifact: true - - path: .yamato/wrench/validation-jobs.yml#validate_-_netcode_gameobjects_-_6000_3_-_ubuntu - specific_options: - UTR: - location: results/UTR/validate-netcode.gameobjects-6000.3-ubuntu - unzip: true - pvp-results: - location: results/pvp/validate-netcode.gameobjects-6000.3-ubuntu - unzip: true - packages: - ignore_artifact: true - - path: .yamato/wrench/validation-jobs.yml#validate_-_netcode_gameobjects_-_6000_3_-_windows - specific_options: - UTR: - location: results/UTR/validate-netcode.gameobjects-6000.3-windows - unzip: true - pvp-results: - location: results/pvp/validate-netcode.gameobjects-6000.3-windows - unzip: true - packages: - ignore_artifact: true variables: UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 UPMPVP_CONTEXT_WRENCH: 0.12.2.0 diff --git a/.yamato/wrench/validation-jobs.yml b/.yamato/wrench/validation-jobs.yml index 1ddd5c8a43..223914a601 100644 --- a/.yamato/wrench/validation-jobs.yml +++ b/.yamato/wrench/validation-jobs.yml @@ -991,201 +991,3 @@ validate_-_netcode_gameobjects_-_6000_2_-_windows: labels: - Packages:netcode.gameobjects -# PVP Editor and Playmode tests for Validate - netcode.gameobjects - 6000.3 - macos (6000.3 - MacOS). -validate_-_netcode_gameobjects_-_6000_3_-_macos: - name: Validate - netcode.gameobjects - 6000.3 - macos - agent: - image: package-ci/macos-13:default - type: Unity::VM::osx - flavor: b1.xlarge - commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-68_53c92d3b34ce3f4b652c9785dd1530bdc5885f6523465d6969c3be91f9ccaaf1.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 - - command: unity-downloader-cli -u trunk -c editor --path .Editor --fast - timeout: 10 - retries: 3 - - command: upm-pvp create-test-project testproject --packages "upm-ci~/packages/*.tgz" --unity .Editor - timeout: 10 - retries: 1 - - command: echo No internal packages to add. - - command: upm-pvp test --unity .Editor --packages "upm-ci~/packages/*.tgz" --results upm-ci~/pvp - timeout: 180 - retries: 0 - - command: upm-pvp require "pkgprom-promote -PVP-29-2 rme" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json - timeout: 5 - retries: 0 - - command: upm-pvp require "rme PVP-160-1 supported" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json - timeout: 10 - retries: 0 - - command: 'UnifiedTestRunner --testproject=testproject --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}" ' - timeout: 180 - retries: 1 - after: - - command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh - artifacts: - Crash Dumps: - paths: - - CrashDumps/** - packages: - paths: - - upm-ci~/packages/**/* - pvp-results: - paths: - - upm-ci~/pvp/**/* - browsable: onDemand - UTR: - paths: - - '*.log' - - '*.xml' - - artifacts/**/* - - testproject/Logs/** - - testproject/Library/*.log - - testproject/*.log - - testproject/Builds/*.log - - build/test-results/** - browsable: onDemand - dependencies: - - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects - variables: - UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 0.12.2.0 - metadata: - Job Maintainers: '#rm-packageworks' - Wrench: 0.12.2.0 - labels: - - Packages:netcode.gameobjects - -# PVP Editor and Playmode tests for Validate - netcode.gameobjects - 6000.3 - ubuntu (6000.3 - Ubuntu). -validate_-_netcode_gameobjects_-_6000_3_-_ubuntu: - name: Validate - netcode.gameobjects - 6000.3 - ubuntu - agent: - image: package-ci/ubuntu-20.04:default - type: Unity::VM - flavor: b1.large - commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-68_53c92d3b34ce3f4b652c9785dd1530bdc5885f6523465d6969c3be91f9ccaaf1.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 - - command: unity-downloader-cli -u trunk -c editor --path .Editor --fast - timeout: 10 - retries: 3 - - command: upm-pvp create-test-project testproject --packages "upm-ci~/packages/*.tgz" --unity .Editor - timeout: 10 - retries: 1 - - command: echo No internal packages to add. - - command: upm-pvp test --unity .Editor --packages "upm-ci~/packages/*.tgz" --results upm-ci~/pvp - timeout: 180 - retries: 0 - - command: upm-pvp require "pkgprom-promote -PVP-29-2 rme" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json - timeout: 5 - retries: 0 - - command: upm-pvp require "rme PVP-160-1 supported" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json - timeout: 10 - retries: 0 - - command: 'UnifiedTestRunner --testproject=testproject --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}" ' - timeout: 180 - retries: 1 - after: - - command: bash .yamato/generated-scripts/infrastructure-instability-detection-linux.sh - artifacts: - Crash Dumps: - paths: - - CrashDumps/** - packages: - paths: - - upm-ci~/packages/**/* - pvp-results: - paths: - - upm-ci~/pvp/**/* - browsable: onDemand - UTR: - paths: - - '*.log' - - '*.xml' - - artifacts/**/* - - testproject/Logs/** - - testproject/Library/*.log - - testproject/*.log - - testproject/Builds/*.log - - build/test-results/** - browsable: onDemand - dependencies: - - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects - variables: - UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 0.12.2.0 - metadata: - Job Maintainers: '#rm-packageworks' - Wrench: 0.12.2.0 - labels: - - Packages:netcode.gameobjects - -# PVP Editor and Playmode tests for Validate - netcode.gameobjects - 6000.3 - windows (6000.3 - Windows). -validate_-_netcode_gameobjects_-_6000_3_-_windows: - name: Validate - netcode.gameobjects - 6000.3 - windows - agent: - image: package-ci/win10:default - type: Unity::VM - flavor: b1.large - commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-68_53c92d3b34ce3f4b652c9785dd1530bdc5885f6523465d6969c3be91f9ccaaf1.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 - - command: unity-downloader-cli -u trunk -c editor --path .Editor --fast - timeout: 10 - retries: 3 - - command: upm-pvp create-test-project testproject --packages "upm-ci~/packages/*.tgz" --unity .Editor - timeout: 10 - retries: 1 - - command: echo No internal packages to add. - - command: upm-pvp test --unity .Editor --packages "upm-ci~/packages/*.tgz" --results upm-ci~/pvp - timeout: 180 - retries: 0 - - command: upm-pvp require "pkgprom-promote -PVP-29-2 rme" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json - timeout: 5 - retries: 0 - - command: upm-pvp require "rme PVP-160-1 supported" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json - timeout: 10 - retries: 0 - - command: 'UnifiedTestRunner.exe --testproject=testproject --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}" ' - timeout: 180 - retries: 1 - after: - - command: .yamato\generated-scripts\infrastructure-instability-detection-win.cmd - artifacts: - Crash Dumps: - paths: - - CrashDumps/** - packages: - paths: - - upm-ci~/packages/**/* - pvp-results: - paths: - - upm-ci~/pvp/**/* - browsable: onDemand - UTR: - paths: - - '*.log' - - '*.xml' - - artifacts/**/* - - testproject/Logs/** - - testproject/Library/*.log - - testproject/*.log - - testproject/Builds/*.log - - build/test-results/** - browsable: onDemand - dependencies: - - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects - variables: - UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 0.12.2.0 - metadata: - Job Maintainers: '#rm-packageworks' - Wrench: 0.12.2.0 - labels: - - Packages:netcode.gameobjects - diff --git a/.yamato/wrench/wrench_config.json b/.yamato/wrench/wrench_config.json index 8e170db3e2..80a5e5338f 100644 --- a/.yamato/wrench/wrench_config.json +++ b/.yamato/wrench/wrench_config.json @@ -11,7 +11,7 @@ }, "InternalOnly": false, "NeverPublish": false, - "MaxEditorVersion": "", + "MaxEditorVersion": "6000.2", "coverageEnabled": false, "coverageCommands": [ "generateAdditionalMetrics;generateHtmlReport;assemblyFilters:ASSEMBLY_NAME;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:YAMATO_SOURCE_DIR/Packages;" diff --git a/Tools/CI/Settings/NGOSettings.cs b/Tools/CI/Settings/NGOSettings.cs index fc4aa2663d..b80600fdbb 100644 --- a/Tools/CI/Settings/NGOSettings.cs +++ b/Tools/CI/Settings/NGOSettings.cs @@ -23,6 +23,7 @@ public class NGOSettings : AnnotatedSettingsBase new PackageOptions() { ReleaseOptions = new ReleaseOptions() { IsReleasing = true }, + MaximumEditorVersion = "6000.2", // NGOv1.X will be deprecated in 6000.3+ so we won't run tests on higher editor versions ValidationOptions = validationOptions } } From 0cbfe80fc509c1baf5f96f4b34c6e6c229b15f08 Mon Sep 17 00:00:00 2001 From: michalChrobot Date: Tue, 5 Aug 2025 17:01:41 +0200 Subject: [PATCH 3/4] Updated CI editors --- .yamato/project.metafile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.yamato/project.metafile b/.yamato/project.metafile index ceef5a1241..57ace9f41e 100644 --- a/.yamato/project.metafile +++ b/.yamato/project.metafile @@ -153,14 +153,13 @@ test_platforms: validation_editors: default: - - trunk + - 6000.2 all: - 2021.3 - 2022.3 - 6000.0 - 6000.1 - 6000.2 - - trunk minimal: - 2021.3 From fc6039beae595ce3b1d95bf919c43a8ec07746b5 Mon Sep 17 00:00:00 2001 From: michalChrobot Date: Wed, 6 Aug 2025 10:00:59 +0200 Subject: [PATCH 4/4] corrected 2021 editor to 2022 and trunk to 6000.2 --- .yamato/_run-all.yml | 86 +++++++++---------- .yamato/_triggers.yml | 72 ++++++++-------- .yamato/code-coverage.yml | 2 +- .yamato/project-builders/project-builders.yml | 2 +- .yamato/project-standards.yml | 2 +- 5 files changed, 82 insertions(+), 82 deletions(-) diff --git a/.yamato/_run-all.yml b/.yamato/_run-all.yml index 6c1257cf0e..194f162878 100644 --- a/.yamato/_run-all.yml +++ b/.yamato/_run-all.yml @@ -16,7 +16,7 @@ run_quick_checks: name: Run Quick Initial Checks dependencies: - .yamato/package-pack.yml#package_pack_-_ngo_ubuntu - - .yamato/project-standards.yml#standards_ubuntu_testproject_trunk + - .yamato/project-standards.yml#standards_ubuntu_testproject_6000.2 # 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 @@ -31,9 +31,9 @@ run_all_package_tests: {% endfor -%} -# Runs all package tests on trunk editor -run_all_package_tests_trunk: - name: Run All Package Tests [Trunk only] +# Runs all package tests on 6000.2 editor (latest supported editor) +run_all_package_tests_6000.2: + name: Run All Package Tests [6000.2 only] dependencies: {% for platform in test_platforms.desktop -%} {% for editor in validation_editors.default -%} @@ -41,12 +41,12 @@ run_all_package_tests_trunk: {% endfor -%} {% endfor -%} -# Runs all package tests on mimimum supported editor (2021.3 in case of NGOv1.X) -run_all_package_tests_2021: - name: Run All Package Tests [2021.3] +# Runs all package tests on mimimum supported editor (2022.3 in case of NGOv1.X) (2022.3 will soon be a minimum supported editor) +run_all_package_tests_2022: + name: Run All Package Tests [2022.3] dependencies: {% for platform in test_platforms.desktop -%} - - .yamato/package-tests.yml#package_test_-_ngo_2021.3_{{ platform.name }} + - .yamato/package-tests.yml#package_test_-_ngo_2022.3_{{ platform.name }} {% endfor -%} @@ -65,9 +65,9 @@ run_all_project_tests: {% endfor -%} -# Runs all projects tests on trunk editor -run_all_project_tests_trunk: - name: Run All Project Tests [Trunk only] +# Runs all projects tests on 6000.2 editor (latest supported editor) +run_all_project_tests_6000.2: + name: Run All Project Tests [6000.2 only] dependencies: {% for project in projects.all -%} {% if project.has_tests == "true" -%} @@ -79,14 +79,14 @@ run_all_project_tests_trunk: {% endif -%} {% endfor -%} -# Runs all projects tests on mimimum supported editor (2021.3 in case of NGOv1.X) -run_all_project_tests_2021: - name: Run All Project Tests [2021.3] +# Runs all projects tests on mimimum supported editor (2022.3 in case of NGOv1.X) (2022.3 will soon be a minimum supported editor) +run_all_project_tests_2022: + name: Run All Project Tests [2022.3] dependencies: {% for project in projects.all -%} {% if project.has_tests == "true" -%} {% for platform in test_platforms.desktop -%} - - .yamato/project-tests.yml#test_{{ project.name }}_{{ platform.name }}_2021.3 + - .yamato/project-tests.yml#test_{{ project.name }}_{{ platform.name }}_2022.3 {% endfor -%} {% endif -%} {% endfor -%} @@ -118,9 +118,9 @@ run_all_webgl_builds: {% endfor -%} -# Runs all WebGL builds on trunk editor -run_all_webgl_builds_trunk: - name: Run All WebGl Build [Trunk only] +# Runs all WebGL builds on 6000.2 editor (latest supported editor) +run_all_webgl_builds_6000.2: + name: Run All WebGl Build [6000.2 only] dependencies: {% for project in projects.default -%} {% for platform in test_platforms.desktop -%} @@ -130,13 +130,13 @@ run_all_webgl_builds_trunk: {% endfor -%} {% endfor -%} -# Runs all WebGL builds on 2021.3 editor -run_all_webgl_builds_2021: - name: Run All WebGl Build [2021.3] +# Runs all WebGL builds on 2022.3 editor (2022.3 will soon be a minimum supported editor) +run_all_webgl_builds_2022: + name: Run All WebGl Build [2022.3] dependencies: {% for project in projects.default -%} {% for platform in test_platforms.desktop -%} - - .yamato/webgl-build.yml#webgl_build_{{ project.name }}_{{ platform.name }}_2021.3 + - .yamato/webgl-build.yml#webgl_build_{{ project.name }}_{{ platform.name }}_2022.3 {% endfor -%} {% endfor -%} @@ -156,9 +156,9 @@ run_all_project_tests_desktop_standalone: {% endfor -%} -# Runs all Desktop tests on trunk editor -run_all_project_tests_desktop_standalone_trunk: - name: Run All Standalone Tests - Desktop [Trunk only] +# Runs all Desktop tests on 6000.2 editor (latest supported editor) +run_all_project_tests_desktop_standalone_6000.2: + name: Run All Standalone Tests - Desktop [6000.2 only] dependencies: {% for project in projects.default -%} {% for platform in test_platforms.desktop -%} @@ -170,14 +170,14 @@ run_all_project_tests_desktop_standalone_trunk: {% endfor -%} {% endfor -%} -# Runs all Desktop tests on mimimum supported editor (2021.3 in case of NGOv1.X) -run_all_project_tests_desktop_standalone_2021: - name: Run All Standalone Tests - Desktop [2021.3] +# Runs all Desktop tests on mimimum supported editor (2022.3 in case of NGOv1.X) (2022.3 will soon be a minimum supported editor) +run_all_project_tests_desktop_standalone_2022: + name: Run All Standalone Tests - Desktop [2022.3] dependencies: {% for project in projects.default -%} {% for platform in test_platforms.desktop -%} {% for backend in scripting_backends -%} - - .yamato/desktop-standalone-tests.yml#desktop_standalone_test_{{ project.name }}_{{ platform.name }}_{{ backend }}_2021.3 + - .yamato/desktop-standalone-tests.yml#desktop_standalone_test_{{ project.name }}_{{ platform.name }}_{{ backend }}_2022.3 {% endfor -%} {% endfor -%} {% endfor -%} @@ -195,9 +195,9 @@ run_all_project_tests_mobile_standalone: {% endfor -%} -# Runs all Mobile tests on trunk editor -run_all_project_tests_mobile_standalone_trunk: - name: Run All Standalone Tests - Mobile [Trunk only] +# Runs all Mobile tests on 6000.2 editor (latest supported editor) +run_all_project_tests_mobile_standalone_6000.2: + name: Run All Standalone Tests - Mobile [6000.2 only] dependencies: {% for project in projects.default -%} {% for platform in test_platforms.mobile_test -%} @@ -207,13 +207,13 @@ run_all_project_tests_mobile_standalone_trunk: {% endfor -%} {% endfor -%} -# Runs all Mobile tests on mimimum supported editor (2021.3 in case of NGOv1.X) -run_all_project_tests_mobile_standalone_2021: - name: Run All Standalone Tests - Mobile [2021.3] +# Runs all Mobile tests on mimimum supported editor (2022.3 in case of NGOv1.X) (2022.3 will soon be a minimum supported editor) +run_all_project_tests_mobile_standalone_2022: + name: Run All Standalone Tests - Mobile [2022.3] dependencies: {% for project in projects.default -%} {% for platform in test_platforms.mobile_test -%} - - .yamato/mobile-standalone-test.yml#mobile_standalone_test_{{ project.name }}_{{ platform.name }}_2021.3 + - .yamato/mobile-standalone-test.yml#mobile_standalone_test_{{ project.name }}_{{ platform.name }}_2022.3 {% endfor -%} {% endfor -%} @@ -231,9 +231,9 @@ run_all_project_tests_console_standalone: {% endfor -%} -# Runs all Console tests on trunk editor -run_all_project_tests_console_standalone_trunk: - name: Run All Standalone Tests - Console [Trunk only] +# Runs all Console tests on 6000.2 editor (latest supported editor) +run_all_project_tests_console_standalone_6000.2: + name: Run All Standalone Tests - Console [6000.2 only] dependencies: {% for project in projects.default -%} {% for platform in test_platforms.console_test -%} @@ -243,12 +243,12 @@ run_all_project_tests_console_standalone_trunk: {% endfor -%} {% endfor -%} -# Runs all Console tests on mimimum supported editor (2021.3 in case of NGOv1.X) -run_all_project_tests_console_standalone_2021: - name: Run All Standalone Tests - Console [2021.3] +# Runs all Console tests on mimimum supported editor (2022.3 in case of NGOv1.X) (2022.3 will soon be a minimum supported editor) +run_all_project_tests_console_standalone_2022: + name: Run All Standalone Tests - Console [2022.3] dependencies: {% for project in projects.default -%} {% for platform in test_platforms.console_test -%} - - .yamato/console-standalone-test.yml#console_standalone_test_{{ project.name }}_{{ platform.name }}_2021.3 + - .yamato/console-standalone-test.yml#console_standalone_test_{{ project.name }}_{{ platform.name }}_2022.3 {% endfor -%} {% endfor -%} diff --git a/.yamato/_triggers.yml b/.yamato/_triggers.yml index 6a274f869c..a789382c8d 100644 --- a/.yamato/_triggers.yml +++ b/.yamato/_triggers.yml @@ -19,7 +19,7 @@ # Nightly: # This test validates same subset as pull_request_trigger with addition of mobile/console tests and webgl builds # Runs daily on develop (local configuration) - # Includes all test types but only on trunk. + # Includes all test types but only on 6000.2 (latest supported editor). # Adds platform-specific and APV validation # Weekly: @@ -45,17 +45,17 @@ pull_request_trigger: name: Pull Request Trigger (develop, develop-2.0.0, & release branches) # Run the following tests on a selection of different desktop platforms dependencies: - # Run package EditMode and Playmode package tests on trunk and an older supported editor (2022.3) (2022.3 will soon be a minimum supported editor) - - .yamato/package-tests.yml#package_test_-_ngo_trunk_mac + # Run package EditMode and Playmode package tests on 6000.2 (latest supported editor) and an older supported editor (2022.3) (2022.3 will soon be a minimum supported editor) + - .yamato/package-tests.yml#package_test_-_ngo_6000.2_mac - .yamato/package-tests.yml#package_test_-_ngo_2022.3_win - # Run testproject EditMode and Playmode project tests on trunk and an older supported editor (2022.3) (2022.3 will soon be a minimum supported editor) - - .yamato/project-tests.yml#test_testproject_win_trunk + # Run testproject EditMode and Playmode project tests on 6000.2 (latest supported editor) and an older supported editor (2022.3) (2022.3 will soon be a minimum supported editor) + - .yamato/project-tests.yml#test_testproject_win_6000.2 - .yamato/project-tests.yml#test_testproject_mac_2022.3 - # Run tools integration tests EditMode and Playmode tests on trunk and an older supported editor (2022.3) (2022.3 will soon be a minimum supported editor) + # Run tools integration tests EditMode and Playmode tests on 6000.2 (latest supported editor) and an older supported editor (2022.3) (2022.3 will soon be a minimum supported editor) - .yamato/project-tests.yml#test_testproject-tools-integration_ubuntu_2022.3 - - .yamato/project-tests.yml#test_testproject-tools-integration_win_trunk + - .yamato/project-tests.yml#test_testproject-tools-integration_win_6000.2 # 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 @@ -71,11 +71,11 @@ pull_request_trigger: - drafts: false -# Run all tests on trunk on nightly basis. +# Run all tests on 6000.2 (latest supported editor) on nightly basis. # Same subset as pull_request_trigger with addition of mobile/desktop/console tests and webgl builds -# Those tests are all running on trunk editor (since it's daily and running all of them would add a lot of overhead) +# Those tests are all running on 6000.2 (latest supported editor) since it's daily and running all of them would add a lot of overhead develop_nightly: - name: "\U0001F319 [Nightly] Run All Tests [Trunk and 2021]" + name: "\U0001F319 [Nightly] Run All Tests [6000.2 and 2022]" triggers: recurring: - branch: develop @@ -83,31 +83,31 @@ 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_2021.3 + - .yamato/project-standards.yml#standards_ubuntu_testproject_6000.2 + - .yamato/project-standards.yml#standards_ubuntu_testproject_2022.3 # 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 2021.3 - - .yamato/_run-all.yml#run_all_package_tests_trunk - - .yamato/_run-all.yml#run_all_package_tests_2021 - # Run project EditMode and PLaymode tests on desktop platforms on trunk and 2021.3 - - .yamato/_run-all.yml#run_all_project_tests_trunk - - .yamato/_run-all.yml#run_all_project_tests_2021 - # Run Runtime tests on desktop players on trunk and 2021 editors - - .yamato/_run-all.yml#run_all_project_tests_desktop_standalone_trunk - - .yamato/_run-all.yml#run_all_project_tests_desktop_standalone_2021 - # Run Runtime tests on mobile players on trunk and 2021 editors - - .yamato/_run-all.yml#run_all_project_tests_mobile_standalone_trunk - - .yamato/_run-all.yml#run_all_project_tests_mobile_standalone_2021 - # Run Runtime tests on console players on trunk and 2021 editors - - .yamato/_run-all.yml#run_all_project_tests_console_standalone_trunk - - .yamato/_run-all.yml#run_all_project_tests_console_standalone_2021 - # Build player for webgl platform on trunk and 2021 editors - - .yamato/_run-all.yml#run_all_webgl_builds_trunk - - .yamato/_run-all.yml#run_all_webgl_builds_2021 - # Build player for webgl platform on trunk and 2021 editors - - .yamato/project-updated-dependencies-test.yml#updated-dependencies_testproject_NGO_ubuntu_trunk - - .yamato/project-updated-dependencies-test.yml#updated-dependencies_testproject_NGO_win_2021.3 + # Run package EditMode and Playmode tests on desktop platforms on 6000.2 (latest supported editor) and 2022.3 (2022.3 will soon be a minimum supported editor) + - .yamato/_run-all.yml#run_all_package_tests_6000.2 + - .yamato/_run-all.yml#run_all_package_tests_2022 + # Run project EditMode and PLaymode tests on desktop platforms on 6000.2 (latest supported editor) and 2022.3 (2022.3 will soon be a minimum supported editor) + - .yamato/_run-all.yml#run_all_project_tests_6000.2 + - .yamato/_run-all.yml#run_all_project_tests_2022 + # Run Runtime tests on desktop players on 6000.2 (latest supported editor) and 2022.3 editors (2022.3 will soon be a minimum supported editor) + - .yamato/_run-all.yml#run_all_project_tests_desktop_standalone_6000.2 + - .yamato/_run-all.yml#run_all_project_tests_desktop_standalone_2022 + # Run Runtime tests on mobile players on 6000.2 (latest supported editor) and 2022.3 editors (2022.3 will soon be a minimum supported editor) + - .yamato/_run-all.yml#run_all_project_tests_mobile_standalone_6000.2 + - .yamato/_run-all.yml#run_all_project_tests_mobile_standalone_2022 + # Run Runtime tests on console players on 6000.2 (latest supported editor) and 2022.3 editors (2022.3 will soon be a minimum supported editor) + - .yamato/_run-all.yml#run_all_project_tests_console_standalone_6000.2 + - .yamato/_run-all.yml#run_all_project_tests_console_standalone_2022 + # Build player for webgl platform on 6000.2 (latest supported editor) and 2022.3 editors (2022.3 will soon be a minimum supported editor) + - .yamato/_run-all.yml#run_all_webgl_builds_6000.2 + - .yamato/_run-all.yml#run_all_webgl_builds_2022 + # Build player for webgl platform on 6000.2 (latest supported editor) and 2022.3 editors (2022.3 will soon be a minimum supported editor) + - .yamato/project-updated-dependencies-test.yml#updated-dependencies_testproject_NGO_ubuntu_6000.2 + - .yamato/project-updated-dependencies-test.yml#updated-dependencies_testproject_NGO_win_2022.3 # 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 @@ -115,7 +115,7 @@ develop_nightly: # Run all tests on weekly bases # Same subset as develop_nightly but runs per all supported editors as well as executes code coverage test and runs project standards per project # It's not running wrench jobs since those will run either way in nightly test run -# This in contrast to nightly checks will run tests on all editors (not only trunk). Running those on weekly basis and trunk tests nightly should be a good balance between making sure that tests are passing and overhead of running lots of tests +# This in contrast to nightly checks will run tests on all editors (not only 6000.2). Running those on weekly basis and 6000.2 (latest supported editor) tests nightly should be a good balance between making sure that tests are passing and overhead of running lots of tests develop_weekly_trunk: name: "\U0001F319 [Weekly] Run All Tests" triggers: @@ -136,7 +136,7 @@ develop_weekly_trunk: - .yamato/_run-all.yml#run_all_project_tests_mobile_standalone # Run Runtime tests on console players - .yamato/_run-all.yml#run_all_project_tests_console_standalone - # Build player for webgl platform on trunk + # Build player for webgl platform on 6000.2 (latest supported editor) - .yamato/_run-all.yml#run_all_webgl_builds # Run code coverage test - - .yamato/code-coverage.yml#code_coverage_ubuntu_trunk + - .yamato/code-coverage.yml#code_coverage_ubuntu_6000.2 diff --git a/.yamato/code-coverage.yml b/.yamato/code-coverage.yml index 0c6cae0975..8cb877e00f 100644 --- a/.yamato/code-coverage.yml +++ b/.yamato/code-coverage.yml @@ -12,7 +12,7 @@ # CONFIGURATION STRUCTURE-------------------------------------------------------------- # Jobs are generated using nested loops through: # 1. For default platform only (Ubuntu) since coverage would not vary between platforms (no need for checks on more platforms) - # 2. For default editor version (trunk) since coverage would not vary between editors (no need for checks on more editors) + # 2. For default editor version (6000.2) since coverage would not vary between editors (no need for checks on more editors) #TECHNICAL CONSIDERATIONS--------------------------------------------------------------- # In theory this job also runs package tests, but we don't want to use it as default since is heavier (because of added coverage analysis) and coverage is not changing that often diff --git a/.yamato/project-builders/project-builders.yml b/.yamato/project-builders/project-builders.yml index bb463d9526..5d5fe3d7d6 100644 --- a/.yamato/project-builders/project-builders.yml +++ b/.yamato/project-builders/project-builders.yml @@ -26,7 +26,7 @@ build_{{ netcodeProject[0] }}_project: image: package-ci/win10:v4 flavor: b1.xlarge variables: - UNITY_VERSION: trunk + UNITY_VERSION: 6000.2 SCRIPTING_BACKEND_IL2CPP_MONO: il2cpp BURST_ON_OFF: on PLATFORM_WIN64_MAC_ANDROID: win64 diff --git a/.yamato/project-standards.yml b/.yamato/project-standards.yml index dd88c60e68..d53c2e613f 100644 --- a/.yamato/project-standards.yml +++ b/.yamato/project-standards.yml @@ -13,7 +13,7 @@ # Jobs configurations are generated using nested loops through: # 1. For all NGO projects (testproject, testproject-tools-interation, minimalproject) # 2. For default platform only (Ubuntu) since standards would not vary between platforms (no need for checks on more platforms) - # 3. For default editor version (trunk) since standards would not vary between editors (no need for checks on more editors) + # 3. For default editor version (6000.2) since standards would not vary between editors (no need for checks on more editors) # TECHNICAL CONSTRAINTS--------------------------------------------------------------- # Requires .NET SDK installed (should be preinstalled on the image so we just check for version)