diff --git a/.yamato/wrench/api-validation-jobs.yml b/.yamato/wrench/api-validation-jobs.yml index b67215cbed..a908f39f70 100644 --- a/.yamato/wrench/api-validation-jobs.yml +++ b/.yamato/wrench/api-validation-jobs.yml @@ -1,15 +1,15 @@ # Auto-generated by Recipe Engine, do not modify manually. -# This job is generated by the wrench recipe engine module, see find the docs here: https://internaldocs.unity.com/packageworks/wrench/gettingstarted/ +# This job is generated by the wrench recipe engine module, see find the docs here: http://Go/ii2fb # upm-ci validation tests for API Validation - inputsystem - 2019.4 - windows (2019.4 - Windows). api_validation_-_inputsystem_-_2019_4_-_windows: name: API Validation - inputsystem - 2019.4 - windows agent: - image: package-ci/win10:default + image: package-ci/win10:v4 type: Unity::VM flavor: b1.large commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-48_af8ccda5754d138ef82ae29c11ddbefa5d3dff1a8f0ddf204c7de9cefa388209.zip -o wrench-localapv.zip + - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-55_0b53f03be6fe71c339ea32c633f3f517a5961ec4d29aa861372042a469eb3ee7.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 @@ -50,11 +50,11 @@ api_validation_-_inputsystem_-_2019_4_-_windows: dependencies: - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_inputsystem variables: - UPMPVP_CONTEXT_WRENCH: 0.10.27.0 + UPMPVP_CONTEXT_WRENCH: 0.10.33.0 triggers: expression: push.branch match "^release/.*" cancel_old_ci: true metadata: Job Maintainers: '#rm-packageworks' - Wrench: 0.10.27.0 + Wrench: 0.10.33.0 diff --git a/.yamato/wrench/package-pack-jobs.yml b/.yamato/wrench/package-pack-jobs.yml index acd90734d5..dd962d18ba 100644 --- a/.yamato/wrench/package-pack-jobs.yml +++ b/.yamato/wrench/package-pack-jobs.yml @@ -1,18 +1,18 @@ # Auto-generated by Recipe Engine, do not modify manually. -# This job is generated by the wrench recipe engine module, see find the docs here: https://internaldocs.unity.com/packageworks/wrench/gettingstarted/ +# This job is generated by the wrench recipe engine module, see find the docs here: http://Go/ii2fb # Pack and Sign Input System package_pack_-_inputsystem: name: Package Pack - inputsystem agent: - image: package-ci/ubuntu-20.04:default + image: package-ci/ubuntu-20.04:v4 type: Unity::VM flavor: b1.large commands: - 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: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-48_af8ccda5754d138ef82ae29c11ddbefa5d3dff1a8f0ddf204c7de9cefa388209.zip -o wrench-localapv.zip + - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-55_0b53f03be6fe71c339ea32c633f3f517a5961ec4d29aa861372042a469eb3ee7.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 @@ -31,8 +31,8 @@ package_pack_-_inputsystem: - upm-ci~/packages/**/* variables: UPMCI_ACK_LARGE_PACKAGE: 1 - UPMPVP_CONTEXT_WRENCH: 0.10.27.0 + UPMPVP_CONTEXT_WRENCH: 0.10.33.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 0.10.27.0 + Wrench: 0.10.33.0 diff --git a/.yamato/wrench/preview-a-p-v.yml b/.yamato/wrench/preview-a-p-v.yml index 91331be521..ee15709d46 100644 --- a/.yamato/wrench/preview-a-p-v.yml +++ b/.yamato/wrench/preview-a-p-v.yml @@ -1,5 +1,5 @@ # Auto-generated by Recipe Engine, do not modify manually. -# This job is generated by the wrench recipe engine module, see find the docs here: https://internaldocs.unity.com/packageworks/wrench/gettingstarted/ +# This job is generated by the wrench recipe engine module, see find the docs here: http://Go/ii2fb # Parent Preview APV Job. all_preview_apv_jobs: @@ -22,7 +22,7 @@ all_preview_apv_jobs: cancel_old_ci: true metadata: Job Maintainers: '#rm-packageworks' - Wrench: 0.10.27.0 + Wrench: 0.10.33.0 # Functional tests for dependents found in the latest 2021.3 manifest (MacOS). preview_apv_-_2021_3_-_macos: @@ -32,7 +32,7 @@ preview_apv_-_2021_3_-_macos: type: Unity::VM::osx flavor: b1.xlarge commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-48_af8ccda5754d138ef82ae29c11ddbefa5d3dff1a8f0ddf204c7de9cefa388209.zip -o wrench-localapv.zip + - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-55_0b53f03be6fe71c339ea32c633f3f517a5961ec4d29aa861372042a469eb3ee7.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 @@ -68,6 +68,7 @@ preview_apv_-_2021_3_-_macos: PreviewAPVResults: paths: - PreviewApvArtifacts~/** + - APVTest/**/manifest.json pvp-results: paths: - upm-ci~/pvp/**/* @@ -75,10 +76,10 @@ preview_apv_-_2021_3_-_macos: dependencies: - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_inputsystem variables: - UPMPVP_CONTEXT_WRENCH: 0.10.27.0 + UPMPVP_CONTEXT_WRENCH: 0.10.33.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 0.10.27.0 + Wrench: 0.10.33.0 # Functional tests for dependents found in the latest 2021.3 manifest (Ubuntu). preview_apv_-_2021_3_-_ubuntu: @@ -88,7 +89,7 @@ preview_apv_-_2021_3_-_ubuntu: type: Unity::VM flavor: b1.large commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-48_af8ccda5754d138ef82ae29c11ddbefa5d3dff1a8f0ddf204c7de9cefa388209.zip -o wrench-localapv.zip + - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-55_0b53f03be6fe71c339ea32c633f3f517a5961ec4d29aa861372042a469eb3ee7.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 @@ -124,6 +125,7 @@ preview_apv_-_2021_3_-_ubuntu: PreviewAPVResults: paths: - PreviewApvArtifacts~/** + - APVTest/**/manifest.json pvp-results: paths: - upm-ci~/pvp/**/* @@ -131,10 +133,10 @@ preview_apv_-_2021_3_-_ubuntu: dependencies: - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_inputsystem variables: - UPMPVP_CONTEXT_WRENCH: 0.10.27.0 + UPMPVP_CONTEXT_WRENCH: 0.10.33.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 0.10.27.0 + Wrench: 0.10.33.0 # Functional tests for dependents found in the latest 2021.3 manifest (Windows). preview_apv_-_2021_3_-_windows: @@ -144,7 +146,8 @@ preview_apv_-_2021_3_-_windows: type: Unity::VM flavor: b1.large commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-48_af8ccda5754d138ef82ae29c11ddbefa5d3dff1a8f0ddf204c7de9cefa388209.zip -o wrench-localapv.zip + - 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-55_0b53f03be6fe71c339ea32c633f3f517a5961ec4d29aa861372042a469eb3ee7.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 @@ -180,6 +183,7 @@ preview_apv_-_2021_3_-_windows: PreviewAPVResults: paths: - PreviewApvArtifacts~/** + - APVTest/**/manifest.json pvp-results: paths: - upm-ci~/pvp/**/* @@ -187,10 +191,10 @@ preview_apv_-_2021_3_-_windows: dependencies: - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_inputsystem variables: - UPMPVP_CONTEXT_WRENCH: 0.10.27.0 + UPMPVP_CONTEXT_WRENCH: 0.10.33.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 0.10.27.0 + Wrench: 0.10.33.0 # Functional tests for dependents found in the latest 2022.3 manifest (MacOS). preview_apv_-_2022_3_-_macos: @@ -200,7 +204,7 @@ preview_apv_-_2022_3_-_macos: type: Unity::VM::osx flavor: b1.xlarge commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-48_af8ccda5754d138ef82ae29c11ddbefa5d3dff1a8f0ddf204c7de9cefa388209.zip -o wrench-localapv.zip + - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-55_0b53f03be6fe71c339ea32c633f3f517a5961ec4d29aa861372042a469eb3ee7.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 @@ -236,6 +240,7 @@ preview_apv_-_2022_3_-_macos: PreviewAPVResults: paths: - PreviewApvArtifacts~/** + - APVTest/**/manifest.json pvp-results: paths: - upm-ci~/pvp/**/* @@ -243,10 +248,10 @@ preview_apv_-_2022_3_-_macos: dependencies: - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_inputsystem variables: - UPMPVP_CONTEXT_WRENCH: 0.10.27.0 + UPMPVP_CONTEXT_WRENCH: 0.10.33.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 0.10.27.0 + Wrench: 0.10.33.0 # Functional tests for dependents found in the latest 2022.3 manifest (Ubuntu). preview_apv_-_2022_3_-_ubuntu: @@ -256,7 +261,7 @@ preview_apv_-_2022_3_-_ubuntu: type: Unity::VM flavor: b1.large commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-48_af8ccda5754d138ef82ae29c11ddbefa5d3dff1a8f0ddf204c7de9cefa388209.zip -o wrench-localapv.zip + - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-55_0b53f03be6fe71c339ea32c633f3f517a5961ec4d29aa861372042a469eb3ee7.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 @@ -292,6 +297,7 @@ preview_apv_-_2022_3_-_ubuntu: PreviewAPVResults: paths: - PreviewApvArtifacts~/** + - APVTest/**/manifest.json pvp-results: paths: - upm-ci~/pvp/**/* @@ -299,10 +305,10 @@ preview_apv_-_2022_3_-_ubuntu: dependencies: - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_inputsystem variables: - UPMPVP_CONTEXT_WRENCH: 0.10.27.0 + UPMPVP_CONTEXT_WRENCH: 0.10.33.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 0.10.27.0 + Wrench: 0.10.33.0 # Functional tests for dependents found in the latest 2022.3 manifest (Windows). preview_apv_-_2022_3_-_windows: @@ -312,7 +318,8 @@ preview_apv_-_2022_3_-_windows: type: Unity::VM flavor: b1.large commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-48_af8ccda5754d138ef82ae29c11ddbefa5d3dff1a8f0ddf204c7de9cefa388209.zip -o wrench-localapv.zip + - 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-55_0b53f03be6fe71c339ea32c633f3f517a5961ec4d29aa861372042a469eb3ee7.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 @@ -348,6 +355,7 @@ preview_apv_-_2022_3_-_windows: PreviewAPVResults: paths: - PreviewApvArtifacts~/** + - APVTest/**/manifest.json pvp-results: paths: - upm-ci~/pvp/**/* @@ -355,10 +363,10 @@ preview_apv_-_2022_3_-_windows: dependencies: - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_inputsystem variables: - UPMPVP_CONTEXT_WRENCH: 0.10.27.0 + UPMPVP_CONTEXT_WRENCH: 0.10.33.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 0.10.27.0 + Wrench: 0.10.33.0 # Functional tests for dependents found in the latest 6000.0 manifest (MacOS). preview_apv_-_6000_0_-_macos: @@ -368,7 +376,7 @@ preview_apv_-_6000_0_-_macos: type: Unity::VM::osx flavor: b1.xlarge commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-48_af8ccda5754d138ef82ae29c11ddbefa5d3dff1a8f0ddf204c7de9cefa388209.zip -o wrench-localapv.zip + - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-55_0b53f03be6fe71c339ea32c633f3f517a5961ec4d29aa861372042a469eb3ee7.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 @@ -404,6 +412,7 @@ preview_apv_-_6000_0_-_macos: PreviewAPVResults: paths: - PreviewApvArtifacts~/** + - APVTest/**/manifest.json pvp-results: paths: - upm-ci~/pvp/**/* @@ -411,10 +420,10 @@ preview_apv_-_6000_0_-_macos: dependencies: - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_inputsystem variables: - UPMPVP_CONTEXT_WRENCH: 0.10.27.0 + UPMPVP_CONTEXT_WRENCH: 0.10.33.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 0.10.27.0 + Wrench: 0.10.33.0 # Functional tests for dependents found in the latest 6000.0 manifest (Ubuntu). preview_apv_-_6000_0_-_ubuntu: @@ -424,7 +433,7 @@ preview_apv_-_6000_0_-_ubuntu: type: Unity::VM flavor: b1.large commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-48_af8ccda5754d138ef82ae29c11ddbefa5d3dff1a8f0ddf204c7de9cefa388209.zip -o wrench-localapv.zip + - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-55_0b53f03be6fe71c339ea32c633f3f517a5961ec4d29aa861372042a469eb3ee7.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 @@ -460,6 +469,7 @@ preview_apv_-_6000_0_-_ubuntu: PreviewAPVResults: paths: - PreviewApvArtifacts~/** + - APVTest/**/manifest.json pvp-results: paths: - upm-ci~/pvp/**/* @@ -467,10 +477,10 @@ preview_apv_-_6000_0_-_ubuntu: dependencies: - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_inputsystem variables: - UPMPVP_CONTEXT_WRENCH: 0.10.27.0 + UPMPVP_CONTEXT_WRENCH: 0.10.33.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 0.10.27.0 + Wrench: 0.10.33.0 # Functional tests for dependents found in the latest 6000.0 manifest (Windows). preview_apv_-_6000_0_-_windows: @@ -480,7 +490,8 @@ preview_apv_-_6000_0_-_windows: type: Unity::VM flavor: b1.large commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-48_af8ccda5754d138ef82ae29c11ddbefa5d3dff1a8f0ddf204c7de9cefa388209.zip -o wrench-localapv.zip + - 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-55_0b53f03be6fe71c339ea32c633f3f517a5961ec4d29aa861372042a469eb3ee7.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 @@ -516,6 +527,7 @@ preview_apv_-_6000_0_-_windows: PreviewAPVResults: paths: - PreviewApvArtifacts~/** + - APVTest/**/manifest.json pvp-results: paths: - upm-ci~/pvp/**/* @@ -523,10 +535,10 @@ preview_apv_-_6000_0_-_windows: dependencies: - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_inputsystem variables: - UPMPVP_CONTEXT_WRENCH: 0.10.27.0 + UPMPVP_CONTEXT_WRENCH: 0.10.33.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 0.10.27.0 + Wrench: 0.10.33.0 # Functional tests for dependents found in the latest 6000.1 manifest (MacOS). preview_apv_-_6000_1_-_macos: @@ -536,7 +548,7 @@ preview_apv_-_6000_1_-_macos: type: Unity::VM::osx flavor: b1.xlarge commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-48_af8ccda5754d138ef82ae29c11ddbefa5d3dff1a8f0ddf204c7de9cefa388209.zip -o wrench-localapv.zip + - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-55_0b53f03be6fe71c339ea32c633f3f517a5961ec4d29aa861372042a469eb3ee7.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 @@ -572,6 +584,7 @@ preview_apv_-_6000_1_-_macos: PreviewAPVResults: paths: - PreviewApvArtifacts~/** + - APVTest/**/manifest.json pvp-results: paths: - upm-ci~/pvp/**/* @@ -579,10 +592,10 @@ preview_apv_-_6000_1_-_macos: dependencies: - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_inputsystem variables: - UPMPVP_CONTEXT_WRENCH: 0.10.27.0 + UPMPVP_CONTEXT_WRENCH: 0.10.33.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 0.10.27.0 + Wrench: 0.10.33.0 # Functional tests for dependents found in the latest 6000.1 manifest (Ubuntu). preview_apv_-_6000_1_-_ubuntu: @@ -592,7 +605,7 @@ preview_apv_-_6000_1_-_ubuntu: type: Unity::VM flavor: b1.large commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-48_af8ccda5754d138ef82ae29c11ddbefa5d3dff1a8f0ddf204c7de9cefa388209.zip -o wrench-localapv.zip + - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-55_0b53f03be6fe71c339ea32c633f3f517a5961ec4d29aa861372042a469eb3ee7.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 @@ -628,6 +641,7 @@ preview_apv_-_6000_1_-_ubuntu: PreviewAPVResults: paths: - PreviewApvArtifacts~/** + - APVTest/**/manifest.json pvp-results: paths: - upm-ci~/pvp/**/* @@ -635,10 +649,10 @@ preview_apv_-_6000_1_-_ubuntu: dependencies: - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_inputsystem variables: - UPMPVP_CONTEXT_WRENCH: 0.10.27.0 + UPMPVP_CONTEXT_WRENCH: 0.10.33.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 0.10.27.0 + Wrench: 0.10.33.0 # Functional tests for dependents found in the latest 6000.1 manifest (Windows). preview_apv_-_6000_1_-_windows: @@ -648,7 +662,8 @@ preview_apv_-_6000_1_-_windows: type: Unity::VM flavor: b1.large commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-48_af8ccda5754d138ef82ae29c11ddbefa5d3dff1a8f0ddf204c7de9cefa388209.zip -o wrench-localapv.zip + - 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-55_0b53f03be6fe71c339ea32c633f3f517a5961ec4d29aa861372042a469eb3ee7.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 @@ -684,6 +699,7 @@ preview_apv_-_6000_1_-_windows: PreviewAPVResults: paths: - PreviewApvArtifacts~/** + - APVTest/**/manifest.json pvp-results: paths: - upm-ci~/pvp/**/* @@ -691,8 +707,8 @@ preview_apv_-_6000_1_-_windows: dependencies: - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_inputsystem variables: - UPMPVP_CONTEXT_WRENCH: 0.10.27.0 + UPMPVP_CONTEXT_WRENCH: 0.10.33.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 0.10.27.0 + Wrench: 0.10.33.0 diff --git a/.yamato/wrench/promotion-jobs.yml b/.yamato/wrench/promotion-jobs.yml index 6590d236de..75f8b4dd28 100644 --- a/.yamato/wrench/promotion-jobs.yml +++ b/.yamato/wrench/promotion-jobs.yml @@ -1,5 +1,5 @@ # Auto-generated by Recipe Engine, do not modify manually. -# This job is generated by the wrench recipe engine module, see find the docs here: https://internaldocs.unity.com/packageworks/wrench/gettingstarted/ +# This job is generated by the wrench recipe engine module, see find the docs here: http://Go/ii2fb # Publish Dry Run for inputsystem to https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-npm publish_dry_run_inputsystem: @@ -9,7 +9,7 @@ publish_dry_run_inputsystem: type: Unity::VM flavor: b1.large commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-48_af8ccda5754d138ef82ae29c11ddbefa5d3dff1a8f0ddf204c7de9cefa388209.zip -o wrench-localapv.zip + - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-55_0b53f03be6fe71c339ea32c633f3f517a5961ec4d29aa861372042a469eb3ee7.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 @@ -151,13 +151,13 @@ publish_dry_run_inputsystem: unzip: true variables: UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 0.10.27.0 + UPMPVP_CONTEXT_WRENCH: 0.10.33.0 triggers: expression: push.branch match "^release/.*" cancel_old_ci: true metadata: Job Maintainers: '#rm-packageworks' - Wrench: 0.10.27.0 + Wrench: 0.10.33.0 # Publish for inputsystem to https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-npm publish_inputsystem: @@ -167,7 +167,7 @@ publish_inputsystem: type: Unity::VM flavor: b1.large commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-48_af8ccda5754d138ef82ae29c11ddbefa5d3dff1a8f0ddf204c7de9cefa388209.zip -o wrench-localapv.zip + - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-55_0b53f03be6fe71c339ea32c633f3f517a5961ec4d29aa861372042a469eb3ee7.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 @@ -309,8 +309,8 @@ publish_inputsystem: unzip: true variables: UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 0.10.27.0 + UPMPVP_CONTEXT_WRENCH: 0.10.33.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 0.10.27.0 + Wrench: 0.10.33.0 diff --git a/.yamato/wrench/recipe-regeneration.yml b/.yamato/wrench/recipe-regeneration.yml new file mode 100644 index 0000000000..a7c76b3d27 --- /dev/null +++ b/.yamato/wrench/recipe-regeneration.yml @@ -0,0 +1,30 @@ +# Auto-generated by Recipe Engine, do not modify manually. +# This job is generated by the wrench recipe engine module, see find the docs here: http://Go/ii2fb + +# Test that Generated Wrench Jobs are up to date. +test_-_wrench_jobs_up_to_date: + name: Test - Wrench Jobs up to date + agent: + image: package-ci/ubuntu-20.04:default + type: Unity::VM + flavor: b1.large + commands: + - command: dotnet run --project Tools/CI/InputSystem.Cookbook.csproj + - command: |- + if [ -n "$(git status --porcelain)" ]; 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/InputSystem.Cookbook.csproj' from the root of your repository to regenerate all job definitions created by wrench." + exit 1 + fi + variables: + DOTNET_CLI_TELEMETRY_OPTOUT: 1 + triggers: + expression: push.branch match "^release/.*" + cancel_old_ci: true + metadata: + Job Maintainers: '#rm-packageworks' + Wrench: 0.10.33.0 + diff --git a/.yamato/wrench/validation-jobs.yml b/.yamato/wrench/validation-jobs.yml index 56d4e11d26..7360358d0c 100644 --- a/.yamato/wrench/validation-jobs.yml +++ b/.yamato/wrench/validation-jobs.yml @@ -1,15 +1,15 @@ # Auto-generated by Recipe Engine, do not modify manually. -# This job is generated by the wrench recipe engine module, see find the docs here: https://internaldocs.unity.com/packageworks/wrench/gettingstarted/ +# This job is generated by the wrench recipe engine module, see find the docs here: http://Go/ii2fb # PVP Editor and Playmode tests for Validate - inputsystem - 2019.4 - macos (2019.4 - MacOS). validate_-_inputsystem_-_2019_4_-_macos: name: Validate - inputsystem - 2019.4 - macos agent: - image: package-ci/macos-13:default + image: package-ci/macos-13:v4 type: Unity::VM::osx flavor: b1.xlarge commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-48_af8ccda5754d138ef82ae29c11ddbefa5d3dff1a8f0ddf204c7de9cefa388209.zip -o wrench-localapv.zip + - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-55_0b53f03be6fe71c339ea32c633f3f517a5961ec4d29aa861372042a469eb3ee7.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 @@ -61,10 +61,10 @@ validate_-_inputsystem_-_2019_4_-_macos: - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_inputsystem variables: UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 0.10.27.0 + UPMPVP_CONTEXT_WRENCH: 0.10.33.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 0.10.27.0 + Wrench: 0.10.33.0 labels: - Packages:inputsystem @@ -72,11 +72,11 @@ validate_-_inputsystem_-_2019_4_-_macos: validate_-_inputsystem_-_2019_4_-_ubuntu: name: Validate - inputsystem - 2019.4 - ubuntu agent: - image: package-ci/ubuntu-20.04:default + image: package-ci/ubuntu-18.04:v4 type: Unity::VM flavor: b1.large commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-48_af8ccda5754d138ef82ae29c11ddbefa5d3dff1a8f0ddf204c7de9cefa388209.zip -o wrench-localapv.zip + - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-55_0b53f03be6fe71c339ea32c633f3f517a5961ec4d29aa861372042a469eb3ee7.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 @@ -128,10 +128,10 @@ validate_-_inputsystem_-_2019_4_-_ubuntu: - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_inputsystem variables: UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 0.10.27.0 + UPMPVP_CONTEXT_WRENCH: 0.10.33.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 0.10.27.0 + Wrench: 0.10.33.0 labels: - Packages:inputsystem @@ -139,11 +139,11 @@ validate_-_inputsystem_-_2019_4_-_ubuntu: validate_-_inputsystem_-_2019_4_-_windows: name: Validate - inputsystem - 2019.4 - windows agent: - image: package-ci/win10:default + image: package-ci/win10:v4 type: Unity::VM flavor: b1.large commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-48_af8ccda5754d138ef82ae29c11ddbefa5d3dff1a8f0ddf204c7de9cefa388209.zip -o wrench-localapv.zip + - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-55_0b53f03be6fe71c339ea32c633f3f517a5961ec4d29aa861372042a469eb3ee7.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 @@ -195,10 +195,10 @@ validate_-_inputsystem_-_2019_4_-_windows: - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_inputsystem variables: UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 0.10.27.0 + UPMPVP_CONTEXT_WRENCH: 0.10.33.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 0.10.27.0 + Wrench: 0.10.33.0 labels: - Packages:inputsystem @@ -206,11 +206,11 @@ validate_-_inputsystem_-_2019_4_-_windows: validate_-_inputsystem_-_2021_3_-_macos: name: Validate - inputsystem - 2021.3 - macos agent: - image: package-ci/macos-13:default + image: package-ci/macos-13:v4 type: Unity::VM::osx flavor: b1.xlarge commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-48_af8ccda5754d138ef82ae29c11ddbefa5d3dff1a8f0ddf204c7de9cefa388209.zip -o wrench-localapv.zip + - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-55_0b53f03be6fe71c339ea32c633f3f517a5961ec4d29aa861372042a469eb3ee7.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 @@ -262,10 +262,10 @@ validate_-_inputsystem_-_2021_3_-_macos: - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_inputsystem variables: UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 0.10.27.0 + UPMPVP_CONTEXT_WRENCH: 0.10.33.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 0.10.27.0 + Wrench: 0.10.33.0 labels: - Packages:inputsystem @@ -273,11 +273,11 @@ validate_-_inputsystem_-_2021_3_-_macos: validate_-_inputsystem_-_2021_3_-_ubuntu: name: Validate - inputsystem - 2021.3 - ubuntu agent: - image: package-ci/ubuntu-20.04:default + image: package-ci/ubuntu-20.04:v4 type: Unity::VM flavor: b1.large commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-48_af8ccda5754d138ef82ae29c11ddbefa5d3dff1a8f0ddf204c7de9cefa388209.zip -o wrench-localapv.zip + - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-55_0b53f03be6fe71c339ea32c633f3f517a5961ec4d29aa861372042a469eb3ee7.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 @@ -329,10 +329,10 @@ validate_-_inputsystem_-_2021_3_-_ubuntu: - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_inputsystem variables: UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 0.10.27.0 + UPMPVP_CONTEXT_WRENCH: 0.10.33.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 0.10.27.0 + Wrench: 0.10.33.0 labels: - Packages:inputsystem @@ -340,11 +340,11 @@ validate_-_inputsystem_-_2021_3_-_ubuntu: validate_-_inputsystem_-_2021_3_-_windows: name: Validate - inputsystem - 2021.3 - windows agent: - image: package-ci/win10:default + image: package-ci/win10:v4 type: Unity::VM flavor: b1.large commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-48_af8ccda5754d138ef82ae29c11ddbefa5d3dff1a8f0ddf204c7de9cefa388209.zip -o wrench-localapv.zip + - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-55_0b53f03be6fe71c339ea32c633f3f517a5961ec4d29aa861372042a469eb3ee7.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 @@ -396,10 +396,10 @@ validate_-_inputsystem_-_2021_3_-_windows: - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_inputsystem variables: UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 0.10.27.0 + UPMPVP_CONTEXT_WRENCH: 0.10.33.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 0.10.27.0 + Wrench: 0.10.33.0 labels: - Packages:inputsystem @@ -407,11 +407,11 @@ validate_-_inputsystem_-_2021_3_-_windows: validate_-_inputsystem_-_2022_3_-_macos: name: Validate - inputsystem - 2022.3 - macos agent: - image: package-ci/macos-13:default + image: package-ci/macos-13:v4 type: Unity::VM::osx flavor: b1.xlarge commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-48_af8ccda5754d138ef82ae29c11ddbefa5d3dff1a8f0ddf204c7de9cefa388209.zip -o wrench-localapv.zip + - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-55_0b53f03be6fe71c339ea32c633f3f517a5961ec4d29aa861372042a469eb3ee7.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 @@ -463,10 +463,10 @@ validate_-_inputsystem_-_2022_3_-_macos: - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_inputsystem variables: UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 0.10.27.0 + UPMPVP_CONTEXT_WRENCH: 0.10.33.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 0.10.27.0 + Wrench: 0.10.33.0 labels: - Packages:inputsystem @@ -474,11 +474,11 @@ validate_-_inputsystem_-_2022_3_-_macos: validate_-_inputsystem_-_2022_3_-_ubuntu: name: Validate - inputsystem - 2022.3 - ubuntu agent: - image: package-ci/ubuntu-20.04:default + image: package-ci/ubuntu-20.04:v4 type: Unity::VM flavor: b1.large commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-48_af8ccda5754d138ef82ae29c11ddbefa5d3dff1a8f0ddf204c7de9cefa388209.zip -o wrench-localapv.zip + - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-55_0b53f03be6fe71c339ea32c633f3f517a5961ec4d29aa861372042a469eb3ee7.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 @@ -530,10 +530,10 @@ validate_-_inputsystem_-_2022_3_-_ubuntu: - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_inputsystem variables: UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 0.10.27.0 + UPMPVP_CONTEXT_WRENCH: 0.10.33.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 0.10.27.0 + Wrench: 0.10.33.0 labels: - Packages:inputsystem @@ -541,11 +541,11 @@ validate_-_inputsystem_-_2022_3_-_ubuntu: validate_-_inputsystem_-_2022_3_-_windows: name: Validate - inputsystem - 2022.3 - windows agent: - image: package-ci/win10:default + image: package-ci/win10:v4 type: Unity::VM flavor: b1.large commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-48_af8ccda5754d138ef82ae29c11ddbefa5d3dff1a8f0ddf204c7de9cefa388209.zip -o wrench-localapv.zip + - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-55_0b53f03be6fe71c339ea32c633f3f517a5961ec4d29aa861372042a469eb3ee7.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 @@ -597,10 +597,10 @@ validate_-_inputsystem_-_2022_3_-_windows: - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_inputsystem variables: UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 0.10.27.0 + UPMPVP_CONTEXT_WRENCH: 0.10.33.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 0.10.27.0 + Wrench: 0.10.33.0 labels: - Packages:inputsystem @@ -608,11 +608,11 @@ validate_-_inputsystem_-_2022_3_-_windows: validate_-_inputsystem_-_6000_0_-_macos: name: Validate - inputsystem - 6000.0 - macos agent: - image: package-ci/macos-13:default + image: package-ci/macos-13:v4 type: Unity::VM::osx flavor: b1.xlarge commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-48_af8ccda5754d138ef82ae29c11ddbefa5d3dff1a8f0ddf204c7de9cefa388209.zip -o wrench-localapv.zip + - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-55_0b53f03be6fe71c339ea32c633f3f517a5961ec4d29aa861372042a469eb3ee7.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 @@ -664,10 +664,10 @@ validate_-_inputsystem_-_6000_0_-_macos: - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_inputsystem variables: UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 0.10.27.0 + UPMPVP_CONTEXT_WRENCH: 0.10.33.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 0.10.27.0 + Wrench: 0.10.33.0 labels: - Packages:inputsystem @@ -675,11 +675,11 @@ validate_-_inputsystem_-_6000_0_-_macos: validate_-_inputsystem_-_6000_0_-_ubuntu: name: Validate - inputsystem - 6000.0 - ubuntu agent: - image: package-ci/ubuntu-20.04:default + image: package-ci/ubuntu-20.04:v4 type: Unity::VM flavor: b1.large commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-48_af8ccda5754d138ef82ae29c11ddbefa5d3dff1a8f0ddf204c7de9cefa388209.zip -o wrench-localapv.zip + - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-55_0b53f03be6fe71c339ea32c633f3f517a5961ec4d29aa861372042a469eb3ee7.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 @@ -731,10 +731,10 @@ validate_-_inputsystem_-_6000_0_-_ubuntu: - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_inputsystem variables: UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 0.10.27.0 + UPMPVP_CONTEXT_WRENCH: 0.10.33.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 0.10.27.0 + Wrench: 0.10.33.0 labels: - Packages:inputsystem @@ -742,11 +742,11 @@ validate_-_inputsystem_-_6000_0_-_ubuntu: validate_-_inputsystem_-_6000_0_-_windows: name: Validate - inputsystem - 6000.0 - windows agent: - image: package-ci/win10:default + image: package-ci/win10:v4 type: Unity::VM flavor: b1.large commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-48_af8ccda5754d138ef82ae29c11ddbefa5d3dff1a8f0ddf204c7de9cefa388209.zip -o wrench-localapv.zip + - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-55_0b53f03be6fe71c339ea32c633f3f517a5961ec4d29aa861372042a469eb3ee7.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 @@ -798,10 +798,10 @@ validate_-_inputsystem_-_6000_0_-_windows: - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_inputsystem variables: UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 0.10.27.0 + UPMPVP_CONTEXT_WRENCH: 0.10.33.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 0.10.27.0 + Wrench: 0.10.33.0 labels: - Packages:inputsystem @@ -809,11 +809,11 @@ validate_-_inputsystem_-_6000_0_-_windows: validate_-_inputsystem_-_6000_1_-_macos: name: Validate - inputsystem - 6000.1 - macos agent: - image: package-ci/macos-13:default + image: package-ci/macos-13:v4 type: Unity::VM::osx flavor: b1.xlarge commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-48_af8ccda5754d138ef82ae29c11ddbefa5d3dff1a8f0ddf204c7de9cefa388209.zip -o wrench-localapv.zip + - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-55_0b53f03be6fe71c339ea32c633f3f517a5961ec4d29aa861372042a469eb3ee7.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 @@ -865,10 +865,10 @@ validate_-_inputsystem_-_6000_1_-_macos: - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_inputsystem variables: UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 0.10.27.0 + UPMPVP_CONTEXT_WRENCH: 0.10.33.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 0.10.27.0 + Wrench: 0.10.33.0 labels: - Packages:inputsystem @@ -876,11 +876,11 @@ validate_-_inputsystem_-_6000_1_-_macos: validate_-_inputsystem_-_6000_1_-_ubuntu: name: Validate - inputsystem - 6000.1 - ubuntu agent: - image: package-ci/ubuntu-20.04:default + image: package-ci/ubuntu-20.04:v4 type: Unity::VM flavor: b1.large commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-48_af8ccda5754d138ef82ae29c11ddbefa5d3dff1a8f0ddf204c7de9cefa388209.zip -o wrench-localapv.zip + - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-55_0b53f03be6fe71c339ea32c633f3f517a5961ec4d29aa861372042a469eb3ee7.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 @@ -932,10 +932,10 @@ validate_-_inputsystem_-_6000_1_-_ubuntu: - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_inputsystem variables: UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 0.10.27.0 + UPMPVP_CONTEXT_WRENCH: 0.10.33.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 0.10.27.0 + Wrench: 0.10.33.0 labels: - Packages:inputsystem @@ -943,11 +943,11 @@ validate_-_inputsystem_-_6000_1_-_ubuntu: validate_-_inputsystem_-_6000_1_-_windows: name: Validate - inputsystem - 6000.1 - windows agent: - image: package-ci/win10:default + image: package-ci/win10:v4 type: Unity::VM flavor: b1.large commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-48_af8ccda5754d138ef82ae29c11ddbefa5d3dff1a8f0ddf204c7de9cefa388209.zip -o wrench-localapv.zip + - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-55_0b53f03be6fe71c339ea32c633f3f517a5961ec4d29aa861372042a469eb3ee7.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 @@ -999,10 +999,10 @@ validate_-_inputsystem_-_6000_1_-_windows: - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_inputsystem variables: UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 0.10.27.0 + UPMPVP_CONTEXT_WRENCH: 0.10.33.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 0.10.27.0 + Wrench: 0.10.33.0 labels: - Packages:inputsystem diff --git a/.yamato/wrench/wrench_config.json b/.yamato/wrench/wrench_config.json index 90f264b6da..f32c9416ae 100644 --- a/.yamato/wrench/wrench_config.json +++ b/.yamato/wrench/wrench_config.json @@ -1,6 +1,5 @@ { - "project_path": "Tools\\CI", - "schema_version": 0.6, + "schema_version": 0.7, "packages": { "com.unity.inputsystem": { "directory": "Packages/com.unity.inputsystem/", @@ -35,6 +34,7 @@ }, "publishing_job": ".yamato/wrench/promotion-jobs.yml#publish_inputsystem", "branch_pattern": "ReleaseSlash", - "wrench_version": "0.10.27.0", - "pvp_exemption_path": ".yamato/wrench/pvp-exemptions.json" + "wrench_version": "0.10.33.0", + "pvp_exemption_path": ".yamato/wrench/pvp-exemptions.json", + "cs_project_path": "Tools/CI/InputSystem.Cookbook.csproj" } \ No newline at end of file diff --git a/Tools/CI/InputSystem.Cookbook.csproj b/Tools/CI/InputSystem.Cookbook.csproj index c7ec781dc3..a7a4ba225d 100644 --- a/Tools/CI/InputSystem.Cookbook.csproj +++ b/Tools/CI/InputSystem.Cookbook.csproj @@ -8,7 +8,7 @@ - + diff --git a/Tools/CI/Settings/InputSystemSettings.cs b/Tools/CI/Settings/InputSystemSettings.cs index 9ebce64c82..c9b68dfdef 100644 --- a/Tools/CI/Settings/InputSystemSettings.cs +++ b/Tools/CI/Settings/InputSystemSettings.cs @@ -1,7 +1,9 @@ using RecipeEngine.Api.Commands; +using RecipeEngine.Api.Platforms; using RecipeEngine.Api.Settings; using RecipeEngine.Modules.Wrench.Models; using RecipeEngine.Modules.Wrench.Settings; +using RecipeEngine.Platforms; namespace InputSystem.Cookbook.Settings; @@ -31,15 +33,38 @@ public class InputSystemSettings : AnnotatedSettingsBase } } }; + + // You can either use a platform.json file or specify custom yamato VM images for each package in code. + private readonly Dictionary ImageOverrides = new() + { + { + SystemType.Windows, + new Platform(new Agent("package-ci/win10:v4", FlavorType.BuildLarge, ResourceType.Vm), SystemType.Windows) + }, + { + SystemType.MacOS, + new Platform(new Agent("package-ci/macos-13:v4", FlavorType.BuildExtraLarge, ResourceType.VmOsx), + SystemType.MacOS) + }, + { + SystemType.Ubuntu, + new Platform(new Agent("package-ci/ubuntu-20.04:v4", FlavorType.BuildLarge, ResourceType.Vm), + SystemType.Ubuntu) + } + }; public InputSystemSettings() { Wrench = new WrenchSettings( PackagesRootPaths, PackageOptions, + wrenchCsProjectPath: "/Tools/CI/InputSystem.Cookbook.csproj", useLocalPvpExemptions: true ); + // change default ubuntu image. + Wrench.Packages["com.unity.inputsystem"].EditorPlatforms = ImageOverrides; + Wrench.PvpProfilesToCheck = new HashSet() { "supported" }; }