diff --git a/.github/workflows/conventional-pr.yml b/.github/workflows/conventional-pr.yml index 8e783eec55..30274254e2 100644 --- a/.github/workflows/conventional-pr.yml +++ b/.github/workflows/conventional-pr.yml @@ -17,7 +17,7 @@ jobs: steps: - name: semantic-pull-request # Internal Unity mirror available at jesseo/action-semantic-pull-request, but actions from private repos aren't supported, so continue to use the public one below - uses: amannn/action-semantic-pull-request@v5 + uses: amannn/action-semantic-pull-request@v6 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: diff --git a/.github/workflows/pr-verification.yml b/.github/workflows/pr-verification.yml index d311231fc3..866a1aa344 100644 --- a/.github/workflows/pr-verification.yml +++ b/.github/workflows/pr-verification.yml @@ -21,7 +21,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout code - uses: actions/checkout@v4 + uses: actions/checkout@v5 - name: Check PR description uses: actions/github-script@v7 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/.yamato/wrench/api-validation-jobs.yml b/.yamato/wrench/api-validation-jobs.yml index 63d89d0c11..3f9c6adc45 100644 --- a/.yamato/wrench/api-validation-jobs.yml +++ b/.yamato/wrench/api-validation-jobs.yml @@ -51,8 +51,8 @@ api_validation_-_netcode_gameobjects_-_6000_0_-_windows: dependencies: - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects variables: - UPMPVP_CONTEXT_WRENCH: 0.12.2.0 + UPMPVP_CONTEXT_WRENCH: 1.0.0.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 0.12.2.0 + Wrench: 1.0.0.0 diff --git a/.yamato/wrench/package-pack-jobs.yml b/.yamato/wrench/package-pack-jobs.yml index 248e89ca51..976cb0f95b 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: 0.12.2.0 + Wrench: 1.0.0.0 diff --git a/.yamato/wrench/preview-a-p-v.yml b/.yamato/wrench/preview-a-p-v.yml index e62b16cb4e..3197e822da 100644 --- a/.yamato/wrench/preview-a-p-v.yml +++ b/.yamato/wrench/preview-a-p-v.yml @@ -8,9 +8,6 @@ all_preview_apv_jobs: - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_0_-_macos - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_0_-_ubuntu - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_0_-_windows - - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_1_-_macos - - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_1_-_ubuntu - - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_1_-_windows - 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 @@ -19,7 +16,7 @@ all_preview_apv_jobs: - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_3_-_windows metadata: Job Maintainers: '#rm-packageworks' - Wrench: 0.12.2.0 + Wrench: 1.0.0.0 # Functional tests for dependents found in the latest 6000.0 manifest (MacOS). preview_apv_-_6000_0_-_macos: @@ -70,16 +67,16 @@ preview_apv_-_6000_0_-_macos: dependencies: - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects variables: - UPMPVP_CONTEXT_WRENCH: 0.12.2.0 + UPMPVP_CONTEXT_WRENCH: 1.0.0.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 0.12.2.0 + Wrench: 1.0.0.0 # Functional tests for dependents found in the latest 6000.0 manifest (Ubuntu). preview_apv_-_6000_0_-_ubuntu: name: Preview APV - 6000.0 - ubuntu agent: - image: package-ci/ubuntu-20.04:default + image: package-ci/ubuntu-22.04:v4 type: Unity::VM flavor: b1.large commands: @@ -124,10 +121,10 @@ preview_apv_-_6000_0_-_ubuntu: dependencies: - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects variables: - UPMPVP_CONTEXT_WRENCH: 0.12.2.0 + UPMPVP_CONTEXT_WRENCH: 1.0.0.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 0.12.2.0 + Wrench: 1.0.0.0 # Functional tests for dependents found in the latest 6000.0 manifest (Windows). preview_apv_-_6000_0_-_windows: @@ -179,173 +176,10 @@ preview_apv_-_6000_0_-_windows: dependencies: - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects variables: - UPMPVP_CONTEXT_WRENCH: 0.12.2.0 + UPMPVP_CONTEXT_WRENCH: 1.0.0.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 0.12.2.0 - -# Functional tests for dependents found in the latest 6000.1 manifest (MacOS). -preview_apv_-_6000_1_-_macos: - name: Preview APV - 6000.1 - 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 6000.1/staging -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.1 --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.1 manifest (Ubuntu). -preview_apv_-_6000_1_-_ubuntu: - name: Preview APV - 6000.1 - 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 6000.1/staging -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.1 --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.1 manifest (Windows). -preview_apv_-_6000_1_-_windows: - name: Preview APV - 6000.1 - 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 6000.1/staging -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.1 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~ - - command: python PythonScripts/editor_manifest_validator.py --version=6000.1 --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 + Wrench: 1.0.0.0 # Functional tests for dependents found in the latest 6000.2 manifest (MacOS). preview_apv_-_6000_2_-_macos: @@ -396,16 +230,16 @@ preview_apv_-_6000_2_-_macos: dependencies: - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects variables: - UPMPVP_CONTEXT_WRENCH: 0.12.2.0 + UPMPVP_CONTEXT_WRENCH: 1.0.0.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 0.12.2.0 + Wrench: 1.0.0.0 # Functional tests for dependents found in the latest 6000.2 manifest (Ubuntu). preview_apv_-_6000_2_-_ubuntu: name: Preview APV - 6000.2 - ubuntu agent: - image: package-ci/ubuntu-20.04:default + image: package-ci/ubuntu-22.04:v4 type: Unity::VM flavor: b1.large commands: @@ -450,10 +284,10 @@ preview_apv_-_6000_2_-_ubuntu: dependencies: - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects variables: - UPMPVP_CONTEXT_WRENCH: 0.12.2.0 + UPMPVP_CONTEXT_WRENCH: 1.0.0.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 0.12.2.0 + Wrench: 1.0.0.0 # Functional tests for dependents found in the latest 6000.2 manifest (Windows). preview_apv_-_6000_2_-_windows: @@ -505,10 +339,10 @@ preview_apv_-_6000_2_-_windows: dependencies: - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects variables: - UPMPVP_CONTEXT_WRENCH: 0.12.2.0 + UPMPVP_CONTEXT_WRENCH: 1.0.0.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 0.12.2.0 + Wrench: 1.0.0.0 # Functional tests for dependents found in the latest 6000.3 manifest (MacOS). preview_apv_-_6000_3_-_macos: @@ -559,16 +393,16 @@ preview_apv_-_6000_3_-_macos: dependencies: - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects variables: - UPMPVP_CONTEXT_WRENCH: 0.12.2.0 + UPMPVP_CONTEXT_WRENCH: 1.0.0.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 0.12.2.0 + Wrench: 1.0.0.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 + image: package-ci/ubuntu-22.04:v4 type: Unity::VM flavor: b1.large commands: @@ -613,10 +447,10 @@ preview_apv_-_6000_3_-_ubuntu: dependencies: - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects variables: - UPMPVP_CONTEXT_WRENCH: 0.12.2.0 + UPMPVP_CONTEXT_WRENCH: 1.0.0.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 0.12.2.0 + Wrench: 1.0.0.0 # Functional tests for dependents found in the latest 6000.3 manifest (Windows). preview_apv_-_6000_3_-_windows: @@ -668,8 +502,8 @@ preview_apv_-_6000_3_-_windows: dependencies: - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects variables: - UPMPVP_CONTEXT_WRENCH: 0.12.2.0 + UPMPVP_CONTEXT_WRENCH: 1.0.0.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 0.12.2.0 + Wrench: 1.0.0.0 diff --git a/.yamato/wrench/promotion-jobs.yml b/.yamato/wrench/promotion-jobs.yml index 50211ca15d..3fd574464a 100644 --- a/.yamato/wrench/promotion-jobs.yml +++ b/.yamato/wrench/promotion-jobs.yml @@ -56,36 +56,6 @@ publish_dry_run_netcode_gameobjects: unzip: true packages: ignore_artifact: true - - path: .yamato/wrench/validation-jobs.yml#validate_-_netcode_gameobjects_-_6000_1_-_macos - specific_options: - UTR: - location: results/UTR/validate-netcode.gameobjects-6000.1-macos - unzip: true - pvp-results: - location: results/pvp/validate-netcode.gameobjects-6000.1-macos - unzip: true - packages: - ignore_artifact: true - - path: .yamato/wrench/validation-jobs.yml#validate_-_netcode_gameobjects_-_6000_1_-_ubuntu - specific_options: - UTR: - location: results/UTR/validate-netcode.gameobjects-6000.1-ubuntu - unzip: true - pvp-results: - location: results/pvp/validate-netcode.gameobjects-6000.1-ubuntu - unzip: true - packages: - ignore_artifact: true - - path: .yamato/wrench/validation-jobs.yml#validate_-_netcode_gameobjects_-_6000_1_-_windows - specific_options: - UTR: - location: results/UTR/validate-netcode.gameobjects-6000.1-windows - unzip: true - pvp-results: - location: results/pvp/validate-netcode.gameobjects-6000.1-windows - unzip: true - packages: - ignore_artifact: true - path: .yamato/wrench/validation-jobs.yml#validate_-_netcode_gameobjects_-_6000_2_-_macos specific_options: UTR: @@ -148,10 +118,10 @@ publish_dry_run_netcode_gameobjects: ignore_artifact: true variables: UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 0.12.2.0 + UPMPVP_CONTEXT_WRENCH: 1.0.0.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 0.12.2.0 + Wrench: 1.0.0.0 # Publish for netcode.gameobjects to https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-npm publish_netcode_gameobjects: @@ -208,36 +178,6 @@ publish_netcode_gameobjects: unzip: true packages: ignore_artifact: true - - path: .yamato/wrench/validation-jobs.yml#validate_-_netcode_gameobjects_-_6000_1_-_macos - specific_options: - UTR: - location: results/UTR/validate-netcode.gameobjects-6000.1-macos - unzip: true - pvp-results: - location: results/pvp/validate-netcode.gameobjects-6000.1-macos - unzip: true - packages: - ignore_artifact: true - - path: .yamato/wrench/validation-jobs.yml#validate_-_netcode_gameobjects_-_6000_1_-_ubuntu - specific_options: - UTR: - location: results/UTR/validate-netcode.gameobjects-6000.1-ubuntu - unzip: true - pvp-results: - location: results/pvp/validate-netcode.gameobjects-6000.1-ubuntu - unzip: true - packages: - ignore_artifact: true - - path: .yamato/wrench/validation-jobs.yml#validate_-_netcode_gameobjects_-_6000_1_-_windows - specific_options: - UTR: - location: results/UTR/validate-netcode.gameobjects-6000.1-windows - unzip: true - pvp-results: - location: results/pvp/validate-netcode.gameobjects-6000.1-windows - unzip: true - packages: - ignore_artifact: true - path: .yamato/wrench/validation-jobs.yml#validate_-_netcode_gameobjects_-_6000_2_-_macos specific_options: UTR: @@ -300,8 +240,8 @@ publish_netcode_gameobjects: ignore_artifact: true variables: UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 0.12.2.0 + UPMPVP_CONTEXT_WRENCH: 1.0.0.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 0.12.2.0 + Wrench: 1.0.0.0 diff --git a/.yamato/wrench/recipe-regeneration.yml b/.yamato/wrench/recipe-regeneration.yml index d3b33987c7..a180a3d577 100644 --- a/.yamato/wrench/recipe-regeneration.yml +++ b/.yamato/wrench/recipe-regeneration.yml @@ -9,14 +9,14 @@ test_-_wrench_jobs_up_to_date: type: Unity::VM flavor: b1.large commands: - - command: dotnet run --project Tools\CI\NGO.Cookbook.csproj + - command: dotnet run --project Tools/CI/NGO.Cookbook.csproj - command: |- if [ -n "$(git status --porcelain -- .yamato/wrench)" ]; then git status echo "Your repo is not clean - diff output:" git diff echo "You must run recipe generation after updating recipes to update the generated YAML!" - echo "Run 'dotnet run --project Tools\CI\NGO.Cookbook.csproj' from the root of your repository to regenerate all job definitions created by wrench." + echo "Run 'dotnet run --project Tools/CI/NGO.Cookbook.csproj' from the root of your repository to regenerate all job definitions created by wrench." exit 1 fi variables: @@ -26,5 +26,5 @@ test_-_wrench_jobs_up_to_date: cancel_old_ci: true metadata: Job Maintainers: '#rm-packageworks' - Wrench: 0.12.2.0 + Wrench: 1.0.0.0 diff --git a/.yamato/wrench/validation-jobs.yml b/.yamato/wrench/validation-jobs.yml index a13846195f..74f5daff5d 100644 --- a/.yamato/wrench/validation-jobs.yml +++ b/.yamato/wrench/validation-jobs.yml @@ -60,10 +60,10 @@ validate_-_netcode_gameobjects_-_6000_0_-_macos: - 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 + UPMPVP_CONTEXT_WRENCH: 1.0.0.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 0.12.2.0 + Wrench: 1.0.0.0 labels: - Packages:netcode.gameobjects @@ -71,7 +71,7 @@ validate_-_netcode_gameobjects_-_6000_0_-_macos: validate_-_netcode_gameobjects_-_6000_0_-_ubuntu: name: Validate - netcode.gameobjects - 6000.0 - ubuntu agent: - image: package-ci/ubuntu-20.04:default + image: package-ci/ubuntu-22.04:v4 type: Unity::VM flavor: b1.large commands: @@ -126,10 +126,10 @@ validate_-_netcode_gameobjects_-_6000_0_-_ubuntu: - 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 + UPMPVP_CONTEXT_WRENCH: 1.0.0.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 0.12.2.0 + Wrench: 1.0.0.0 labels: - Packages:netcode.gameobjects @@ -192,208 +192,10 @@ validate_-_netcode_gameobjects_-_6000_0_-_windows: - 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 + UPMPVP_CONTEXT_WRENCH: 1.0.0.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.1 - macos (6000.1 - MacOS). -validate_-_netcode_gameobjects_-_6000_1_-_macos: - name: Validate - netcode.gameobjects - 6000.1 - 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 6000.1/staging -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: 40 - 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: 40 - 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.1 - ubuntu (6000.1 - Ubuntu). -validate_-_netcode_gameobjects_-_6000_1_-_ubuntu: - name: Validate - netcode.gameobjects - 6000.1 - 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 6000.1/staging -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: 40 - 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: 40 - 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.1 - windows (6000.1 - Windows). -validate_-_netcode_gameobjects_-_6000_1_-_windows: - name: Validate - netcode.gameobjects - 6000.1 - 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 6000.1/staging -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: 40 - 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: 40 - 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 + Wrench: 1.0.0.0 labels: - Packages:netcode.gameobjects @@ -456,10 +258,10 @@ validate_-_netcode_gameobjects_-_6000_2_-_macos: - 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 + UPMPVP_CONTEXT_WRENCH: 1.0.0.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 0.12.2.0 + Wrench: 1.0.0.0 labels: - Packages:netcode.gameobjects @@ -467,7 +269,7 @@ validate_-_netcode_gameobjects_-_6000_2_-_macos: validate_-_netcode_gameobjects_-_6000_2_-_ubuntu: name: Validate - netcode.gameobjects - 6000.2 - ubuntu agent: - image: package-ci/ubuntu-20.04:default + image: package-ci/ubuntu-22.04:v4 type: Unity::VM flavor: b1.large commands: @@ -522,10 +324,10 @@ validate_-_netcode_gameobjects_-_6000_2_-_ubuntu: - 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 + UPMPVP_CONTEXT_WRENCH: 1.0.0.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 0.12.2.0 + Wrench: 1.0.0.0 labels: - Packages:netcode.gameobjects @@ -588,10 +390,10 @@ validate_-_netcode_gameobjects_-_6000_2_-_windows: - 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 + UPMPVP_CONTEXT_WRENCH: 1.0.0.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 0.12.2.0 + Wrench: 1.0.0.0 labels: - Packages:netcode.gameobjects @@ -654,10 +456,10 @@ validate_-_netcode_gameobjects_-_6000_3_-_macos: - 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 + UPMPVP_CONTEXT_WRENCH: 1.0.0.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 0.12.2.0 + Wrench: 1.0.0.0 labels: - Packages:netcode.gameobjects @@ -665,7 +467,7 @@ validate_-_netcode_gameobjects_-_6000_3_-_macos: validate_-_netcode_gameobjects_-_6000_3_-_ubuntu: name: Validate - netcode.gameobjects - 6000.3 - ubuntu agent: - image: package-ci/ubuntu-20.04:default + image: package-ci/ubuntu-22.04:v4 type: Unity::VM flavor: b1.large commands: @@ -720,10 +522,10 @@ validate_-_netcode_gameobjects_-_6000_3_-_ubuntu: - 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 + UPMPVP_CONTEXT_WRENCH: 1.0.0.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 0.12.2.0 + Wrench: 1.0.0.0 labels: - Packages:netcode.gameobjects @@ -786,10 +588,10 @@ validate_-_netcode_gameobjects_-_6000_3_-_windows: - 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 + UPMPVP_CONTEXT_WRENCH: 1.0.0.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 0.12.2.0 + Wrench: 1.0.0.0 labels: - Packages:netcode.gameobjects diff --git a/.yamato/wrench/wrench_config.json b/.yamato/wrench/wrench_config.json index 2351d77178..5f853c7043 100644 --- a/.yamato/wrench/wrench_config.json +++ b/.yamato/wrench/wrench_config.json @@ -31,7 +31,7 @@ }, "publishing_job": ".yamato/wrench/promotion-jobs.yml#publish_netcode_gameobjects", "branch_pattern": "ReleaseSlash", - "wrench_version": "0.12.2.0", + "wrench_version": "1.0.0.0", "pvp_exemption_path": ".yamato/wrench/pvp-exemptions.json", - "cs_project_path": "Tools\\CI\\NGO.Cookbook.csproj" + "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 3b082afaf0..62d37b90d9 100644 --- a/Tools/CI/NGO.Cookbook.csproj +++ b/Tools/CI/NGO.Cookbook.csproj @@ -8,7 +8,11 @@ - + + + + + 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