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/.yamato/wrench/preview-a-p-v.yml b/.yamato/wrench/preview-a-p-v.yml index 56aa78ff7a..6495430027 100644 --- a/.yamato/wrench/preview-a-p-v.yml +++ b/.yamato/wrench/preview-a-p-v.yml @@ -14,9 +14,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 @@ -513,169 +510,6 @@ preview_apv_-_6000_0_-_windows: 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 - # Functional tests for dependents found in the latest 6000.2 manifest (MacOS). preview_apv_-_6000_2_-_macos: name: Preview APV - 6000.2 - macos diff --git a/.yamato/wrench/promotion-jobs.yml b/.yamato/wrench/promotion-jobs.yml index 84f9d29650..b47455b184 100644 --- a/.yamato/wrench/promotion-jobs.yml +++ b/.yamato/wrench/promotion-jobs.yml @@ -116,36 +116,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: @@ -298,36 +268,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: diff --git a/.yamato/wrench/recipe-regeneration.yml b/.yamato/wrench/recipe-regeneration.yml index 5f3a545a0b..d3b33987c7 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: diff --git a/.yamato/wrench/validation-jobs.yml b/.yamato/wrench/validation-jobs.yml index 223914a601..47c7c17302 100644 --- a/.yamato/wrench/validation-jobs.yml +++ b/.yamato/wrench/validation-jobs.yml @@ -595,204 +595,6 @@ validate_-_netcode_gameobjects_-_6000_0_-_windows: 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: 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.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: 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.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: 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 - # PVP Editor and Playmode tests for Validate - netcode.gameobjects - 6000.2 - macos (6000.2 - MacOS). validate_-_netcode_gameobjects_-_6000_2_-_macos: name: Validate - netcode.gameobjects - 6000.2 - macos diff --git a/.yamato/wrench/wrench_config.json b/.yamato/wrench/wrench_config.json index 80a5e5338f..2d87b9b46c 100644 --- a/.yamato/wrench/wrench_config.json +++ b/.yamato/wrench/wrench_config.json @@ -33,5 +33,5 @@ "branch_pattern": "ReleaseSlash", "wrench_version": "0.12.2.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