diff --git a/.yamato/wrench/api-validation-jobs.yml b/.yamato/wrench/api-validation-jobs.yml
index fbf53ff99c..0f86465c03 100644
--- a/.yamato/wrench/api-validation-jobs.yml
+++ b/.yamato/wrench/api-validation-jobs.yml
@@ -3,15 +3,15 @@
all_api_validation_jobs:
name: All API Validation Jobs
dependencies:
- - path: .yamato/wrench/api-validation-jobs.yml#api_validation_-_netcode_gameobjects_-_2022_3_-_windows
+ - path: .yamato/wrench/api-validation-jobs.yml#api_validation_-_netcode_gameobjects_-_2022_3_-_win10
-# upm-ci validation tests for API Validation - netcode.gameobjects - 2022.3 - windows (2022.3 - Windows).
-api_validation_-_netcode_gameobjects_-_2022_3_-_windows:
- name: API Validation - netcode.gameobjects - 2022.3 - windows
+# upm-ci validation tests for API Validation - netcode.gameobjects - 2022.3 - win10 (2022.3 - Windows).
+api_validation_-_netcode_gameobjects_-_2022_3_-_win10:
+ name: API Validation - netcode.gameobjects - 2022.3 - win10
agent:
- image: package-ci/win10:default
+ image: package-ci/win10:v4
type: Unity::VM
- flavor: b1.large
+ flavor: b1.xlarge
commands:
- command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.zip -o wrench-localapv.zip
- command: 7z x -aoa wrench-localapv.zip
@@ -55,8 +55,8 @@ api_validation_-_netcode_gameobjects_-_2022_3_-_windows:
UNITY_LICENSING_SERVER_DELETE_NUL: 0
UNITY_LICENSING_SERVER_DELETE_ULF: 0
UNITY_LICENSING_SERVER_TOOLSET: pro
- UPMPVP_CONTEXT_WRENCH: 1.4.8.0
+ UPMPVP_CONTEXT_WRENCH: 2.2.0.0
metadata:
Job Maintainers: '#rm-packageworks'
- Wrench: 1.4.8.0
+ Wrench: 2.2.0.0
diff --git a/.yamato/wrench/package-pack-jobs.yml b/.yamato/wrench/package-pack-jobs.yml
index 3f3678a4b9..b898efd827 100644
--- a/.yamato/wrench/package-pack-jobs.yml
+++ b/.yamato/wrench/package-pack-jobs.yml
@@ -5,7 +5,7 @@
package_pack_-_netcode_gameobjects:
name: Package Pack - netcode.gameobjects
agent:
- image: package-ci/ubuntu-20.04:default
+ image: package-ci/ubuntu-22.04:v4
type: Unity::VM
flavor: b1.large
commands:
@@ -24,5 +24,5 @@ package_pack_-_netcode_gameobjects:
UPMCI_ACK_LARGE_PACKAGE: 1
metadata:
Job Maintainers: '#rm-packageworks'
- Wrench: 1.4.8.0
+ Wrench: 2.2.0.0
diff --git a/.yamato/wrench/player-build.yml b/.yamato/wrench/player-build.yml
new file mode 100644
index 0000000000..c0fe380114
--- /dev/null
+++ b/.yamato/wrench/player-build.yml
@@ -0,0 +1,4 @@
+# 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
+{}
+
diff --git a/.yamato/wrench/player-test.yml b/.yamato/wrench/player-test.yml
new file mode 100644
index 0000000000..c0fe380114
--- /dev/null
+++ b/.yamato/wrench/player-test.yml
@@ -0,0 +1,4 @@
+# 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
+{}
+
diff --git a/.yamato/wrench/preview-a-p-v.yml b/.yamato/wrench/preview-a-p-v.yml
index a93642aadf..e3d1c12d1f 100644
--- a/.yamato/wrench/preview-a-p-v.yml
+++ b/.yamato/wrench/preview-a-p-v.yml
@@ -5,23 +5,23 @@
all_preview_apv_jobs:
name: All Preview APV Jobs
dependencies:
- - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_2022_3_-_macos
- - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_2022_3_-_ubuntu
- - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_2022_3_-_windows
- - 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_-_2022_3_-_macos13
+ - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_2022_3_-_ubuntu1804
+ - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_2022_3_-_win10
+ - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_0_-_macos13
+ - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_0_-_ubuntu2204
+ - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_0_-_win10
metadata:
Job Maintainers: '#rm-packageworks'
- Wrench: 1.4.8.0
+ Wrench: 2.2.0.0
# Functional tests for dependents found in the latest 2022.3 manifest (MacOS).
-preview_apv_-_2022_3_-_macos:
- name: Preview APV - 2022.3 - macos
+preview_apv_-_2022_3_-_macos13:
+ name: Preview APV - 2022.3 - macos13
agent:
- image: package-ci/macos-13:default
+ image: package-ci/macos-13:v4
type: Unity::VM::osx
- flavor: b1.xlarge
+ flavor: b1.large
commands:
- command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.zip -o wrench-localapv.zip
- command: 7z x -aoa wrench-localapv.zip
@@ -68,16 +68,16 @@ preview_apv_-_2022_3_-_macos:
UNITY_LICENSING_SERVER_DELETE_NUL: 0
UNITY_LICENSING_SERVER_DELETE_ULF: 0
UNITY_LICENSING_SERVER_TOOLSET: pro
- UPMPVP_CONTEXT_WRENCH: 1.4.8.0
+ UPMPVP_CONTEXT_WRENCH: 2.2.0.0
metadata:
Job Maintainers: '#rm-packageworks'
- Wrench: 1.4.8.0
+ Wrench: 2.2.0.0
# Functional tests for dependents found in the latest 2022.3 manifest (Ubuntu).
-preview_apv_-_2022_3_-_ubuntu:
- name: Preview APV - 2022.3 - ubuntu
+preview_apv_-_2022_3_-_ubuntu1804:
+ name: Preview APV - 2022.3 - ubuntu1804
agent:
- image: package-ci/ubuntu-20.04:default
+ image: package-ci/ubuntu-18.04:v4
type: Unity::VM
flavor: b1.large
commands:
@@ -126,18 +126,18 @@ preview_apv_-_2022_3_-_ubuntu:
UNITY_LICENSING_SERVER_DELETE_NUL: 0
UNITY_LICENSING_SERVER_DELETE_ULF: 0
UNITY_LICENSING_SERVER_TOOLSET: pro
- UPMPVP_CONTEXT_WRENCH: 1.4.8.0
+ UPMPVP_CONTEXT_WRENCH: 2.2.0.0
metadata:
Job Maintainers: '#rm-packageworks'
- Wrench: 1.4.8.0
+ Wrench: 2.2.0.0
# Functional tests for dependents found in the latest 2022.3 manifest (Windows).
-preview_apv_-_2022_3_-_windows:
- name: Preview APV - 2022.3 - windows
+preview_apv_-_2022_3_-_win10:
+ name: Preview APV - 2022.3 - win10
agent:
- image: package-ci/win10:default
+ image: package-ci/win10:v4
type: Unity::VM
- flavor: b1.large
+ flavor: b1.xlarge
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-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.zip -o wrench-localapv.zip
@@ -185,18 +185,18 @@ preview_apv_-_2022_3_-_windows:
UNITY_LICENSING_SERVER_DELETE_NUL: 0
UNITY_LICENSING_SERVER_DELETE_ULF: 0
UNITY_LICENSING_SERVER_TOOLSET: pro
- UPMPVP_CONTEXT_WRENCH: 1.4.8.0
+ UPMPVP_CONTEXT_WRENCH: 2.2.0.0
metadata:
Job Maintainers: '#rm-packageworks'
- Wrench: 1.4.8.0
+ Wrench: 2.2.0.0
# Functional tests for dependents found in the latest 6000.0 manifest (MacOS).
-preview_apv_-_6000_0_-_macos:
- name: Preview APV - 6000.0 - macos
+preview_apv_-_6000_0_-_macos13:
+ name: Preview APV - 6000.0 - macos13
agent:
- image: package-ci/macos-13:default
+ image: package-ci/macos-13:v4
type: Unity::VM::osx
- flavor: b1.xlarge
+ flavor: b1.large
commands:
- command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.zip -o wrench-localapv.zip
- command: 7z x -aoa wrench-localapv.zip
@@ -243,14 +243,14 @@ preview_apv_-_6000_0_-_macos:
UNITY_LICENSING_SERVER_DELETE_NUL: 0
UNITY_LICENSING_SERVER_DELETE_ULF: 0
UNITY_LICENSING_SERVER_TOOLSET: pro
- UPMPVP_CONTEXT_WRENCH: 1.4.8.0
+ UPMPVP_CONTEXT_WRENCH: 2.2.0.0
metadata:
Job Maintainers: '#rm-packageworks'
- Wrench: 1.4.8.0
+ Wrench: 2.2.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
+preview_apv_-_6000_0_-_ubuntu2204:
+ name: Preview APV - 6000.0 - ubuntu2204
agent:
image: package-ci/ubuntu-22.04:v4
type: Unity::VM
@@ -301,18 +301,18 @@ preview_apv_-_6000_0_-_ubuntu:
UNITY_LICENSING_SERVER_DELETE_NUL: 0
UNITY_LICENSING_SERVER_DELETE_ULF: 0
UNITY_LICENSING_SERVER_TOOLSET: pro
- UPMPVP_CONTEXT_WRENCH: 1.4.8.0
+ UPMPVP_CONTEXT_WRENCH: 2.2.0.0
metadata:
Job Maintainers: '#rm-packageworks'
- Wrench: 1.4.8.0
+ Wrench: 2.2.0.0
# Functional tests for dependents found in the latest 6000.0 manifest (Windows).
-preview_apv_-_6000_0_-_windows:
- name: Preview APV - 6000.0 - windows
+preview_apv_-_6000_0_-_win10:
+ name: Preview APV - 6000.0 - win10
agent:
- image: package-ci/win10:default
+ image: package-ci/win10:v4
type: Unity::VM
- flavor: b1.large
+ flavor: b1.xlarge
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-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.zip -o wrench-localapv.zip
@@ -360,8 +360,8 @@ preview_apv_-_6000_0_-_windows:
UNITY_LICENSING_SERVER_DELETE_NUL: 0
UNITY_LICENSING_SERVER_DELETE_ULF: 0
UNITY_LICENSING_SERVER_TOOLSET: pro
- UPMPVP_CONTEXT_WRENCH: 1.4.8.0
+ UPMPVP_CONTEXT_WRENCH: 2.2.0.0
metadata:
Job Maintainers: '#rm-packageworks'
- Wrench: 1.4.8.0
+ Wrench: 2.2.0.0
diff --git a/.yamato/wrench/promotion-jobs.yml b/.yamato/wrench/promotion-jobs.yml
index be3b43d908..63601ad429 100644
--- a/.yamato/wrench/promotion-jobs.yml
+++ b/.yamato/wrench/promotion-jobs.yml
@@ -5,7 +5,7 @@
publish_dry_run_netcode_gameobjects:
name: Publish Dry Run netcode.gameobjects
agent:
- image: package-ci/ubuntu-20.04:default
+ image: package-ci/ubuntu-20.04:v4
type: Unity::VM
flavor: b1.large
commands:
@@ -26,78 +26,78 @@ publish_dry_run_netcode_gameobjects:
browsable: onNonSuccess
dependencies:
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
- - path: .yamato/wrench/validation-jobs.yml#validate_-_netcode_gameobjects_-_2022_3_-_macos
+ - path: .yamato/wrench/validation-jobs.yml#validate_-_netcode_gameobjects_-_2022_3_-_macos13
specific_options:
packages:
ignore_artifact: true
pvp-results:
- location: results/pvp/validate-netcode.gameobjects-2022.3-macos
+ location: results/pvp/validate-netcode.gameobjects-2022.3-macos13
unzip: true
UTR:
- location: results/UTR/validate-netcode.gameobjects-2022.3-macos
+ location: results/UTR/validate-netcode.gameobjects-2022.3-macos13
unzip: true
- - path: .yamato/wrench/validation-jobs.yml#validate_-_netcode_gameobjects_-_2022_3_-_ubuntu
+ - path: .yamato/wrench/validation-jobs.yml#validate_-_netcode_gameobjects_-_2022_3_-_ubuntu1804
specific_options:
packages:
ignore_artifact: true
pvp-results:
- location: results/pvp/validate-netcode.gameobjects-2022.3-ubuntu
+ location: results/pvp/validate-netcode.gameobjects-2022.3-ubuntu1804
unzip: true
UTR:
- location: results/UTR/validate-netcode.gameobjects-2022.3-ubuntu
+ location: results/UTR/validate-netcode.gameobjects-2022.3-ubuntu1804
unzip: true
- - path: .yamato/wrench/validation-jobs.yml#validate_-_netcode_gameobjects_-_2022_3_-_windows
+ - path: .yamato/wrench/validation-jobs.yml#validate_-_netcode_gameobjects_-_2022_3_-_win10
specific_options:
packages:
ignore_artifact: true
pvp-results:
- location: results/pvp/validate-netcode.gameobjects-2022.3-windows
+ location: results/pvp/validate-netcode.gameobjects-2022.3-win10
unzip: true
UTR:
- location: results/UTR/validate-netcode.gameobjects-2022.3-windows
+ location: results/UTR/validate-netcode.gameobjects-2022.3-win10
unzip: true
- - path: .yamato/wrench/validation-jobs.yml#validate_-_netcode_gameobjects_-_6000_0_-_macos
+ - path: .yamato/wrench/validation-jobs.yml#validate_-_netcode_gameobjects_-_6000_0_-_macos13
specific_options:
packages:
ignore_artifact: true
pvp-results:
- location: results/pvp/validate-netcode.gameobjects-6000.0-macos
+ location: results/pvp/validate-netcode.gameobjects-6000.0-macos13
unzip: true
UTR:
- location: results/UTR/validate-netcode.gameobjects-6000.0-macos
+ location: results/UTR/validate-netcode.gameobjects-6000.0-macos13
unzip: true
- - path: .yamato/wrench/validation-jobs.yml#validate_-_netcode_gameobjects_-_6000_0_-_ubuntu
+ - path: .yamato/wrench/validation-jobs.yml#validate_-_netcode_gameobjects_-_6000_0_-_ubuntu2204
specific_options:
packages:
ignore_artifact: true
pvp-results:
- location: results/pvp/validate-netcode.gameobjects-6000.0-ubuntu
+ location: results/pvp/validate-netcode.gameobjects-6000.0-ubuntu2204
unzip: true
UTR:
- location: results/UTR/validate-netcode.gameobjects-6000.0-ubuntu
+ location: results/UTR/validate-netcode.gameobjects-6000.0-ubuntu2204
unzip: true
- - path: .yamato/wrench/validation-jobs.yml#validate_-_netcode_gameobjects_-_6000_0_-_windows
+ - path: .yamato/wrench/validation-jobs.yml#validate_-_netcode_gameobjects_-_6000_0_-_win10
specific_options:
packages:
ignore_artifact: true
pvp-results:
- location: results/pvp/validate-netcode.gameobjects-6000.0-windows
+ location: results/pvp/validate-netcode.gameobjects-6000.0-win10
unzip: true
UTR:
- location: results/UTR/validate-netcode.gameobjects-6000.0-windows
+ location: results/UTR/validate-netcode.gameobjects-6000.0-win10
unzip: true
variables:
UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
- UPMPVP_CONTEXT_WRENCH: 1.4.8.0
+ UPMPVP_CONTEXT_WRENCH: 2.2.0.0
metadata:
Job Maintainers: '#rm-packageworks'
- Wrench: 1.4.8.0
+ Wrench: 2.2.0.0
# Publish for netcode.gameobjects to https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-npm
publish_netcode_gameobjects:
name: Publish netcode.gameobjects
agent:
- image: package-ci/ubuntu-20.04:default
+ image: package-ci/ubuntu-20.04:v4
type: Unity::VM
flavor: b1.large
commands:
@@ -118,70 +118,70 @@ publish_netcode_gameobjects:
browsable: onNonSuccess
dependencies:
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
- - path: .yamato/wrench/validation-jobs.yml#validate_-_netcode_gameobjects_-_2022_3_-_macos
+ - path: .yamato/wrench/validation-jobs.yml#validate_-_netcode_gameobjects_-_2022_3_-_macos13
specific_options:
packages:
ignore_artifact: true
pvp-results:
- location: results/pvp/validate-netcode.gameobjects-2022.3-macos
+ location: results/pvp/validate-netcode.gameobjects-2022.3-macos13
unzip: true
UTR:
- location: results/UTR/validate-netcode.gameobjects-2022.3-macos
+ location: results/UTR/validate-netcode.gameobjects-2022.3-macos13
unzip: true
- - path: .yamato/wrench/validation-jobs.yml#validate_-_netcode_gameobjects_-_2022_3_-_ubuntu
+ - path: .yamato/wrench/validation-jobs.yml#validate_-_netcode_gameobjects_-_2022_3_-_ubuntu1804
specific_options:
packages:
ignore_artifact: true
pvp-results:
- location: results/pvp/validate-netcode.gameobjects-2022.3-ubuntu
+ location: results/pvp/validate-netcode.gameobjects-2022.3-ubuntu1804
unzip: true
UTR:
- location: results/UTR/validate-netcode.gameobjects-2022.3-ubuntu
+ location: results/UTR/validate-netcode.gameobjects-2022.3-ubuntu1804
unzip: true
- - path: .yamato/wrench/validation-jobs.yml#validate_-_netcode_gameobjects_-_2022_3_-_windows
+ - path: .yamato/wrench/validation-jobs.yml#validate_-_netcode_gameobjects_-_2022_3_-_win10
specific_options:
packages:
ignore_artifact: true
pvp-results:
- location: results/pvp/validate-netcode.gameobjects-2022.3-windows
+ location: results/pvp/validate-netcode.gameobjects-2022.3-win10
unzip: true
UTR:
- location: results/UTR/validate-netcode.gameobjects-2022.3-windows
+ location: results/UTR/validate-netcode.gameobjects-2022.3-win10
unzip: true
- - path: .yamato/wrench/validation-jobs.yml#validate_-_netcode_gameobjects_-_6000_0_-_macos
+ - path: .yamato/wrench/validation-jobs.yml#validate_-_netcode_gameobjects_-_6000_0_-_macos13
specific_options:
packages:
ignore_artifact: true
pvp-results:
- location: results/pvp/validate-netcode.gameobjects-6000.0-macos
+ location: results/pvp/validate-netcode.gameobjects-6000.0-macos13
unzip: true
UTR:
- location: results/UTR/validate-netcode.gameobjects-6000.0-macos
+ location: results/UTR/validate-netcode.gameobjects-6000.0-macos13
unzip: true
- - path: .yamato/wrench/validation-jobs.yml#validate_-_netcode_gameobjects_-_6000_0_-_ubuntu
+ - path: .yamato/wrench/validation-jobs.yml#validate_-_netcode_gameobjects_-_6000_0_-_ubuntu2204
specific_options:
packages:
ignore_artifact: true
pvp-results:
- location: results/pvp/validate-netcode.gameobjects-6000.0-ubuntu
+ location: results/pvp/validate-netcode.gameobjects-6000.0-ubuntu2204
unzip: true
UTR:
- location: results/UTR/validate-netcode.gameobjects-6000.0-ubuntu
+ location: results/UTR/validate-netcode.gameobjects-6000.0-ubuntu2204
unzip: true
- - path: .yamato/wrench/validation-jobs.yml#validate_-_netcode_gameobjects_-_6000_0_-_windows
+ - path: .yamato/wrench/validation-jobs.yml#validate_-_netcode_gameobjects_-_6000_0_-_win10
specific_options:
packages:
ignore_artifact: true
pvp-results:
- location: results/pvp/validate-netcode.gameobjects-6000.0-windows
+ location: results/pvp/validate-netcode.gameobjects-6000.0-win10
unzip: true
UTR:
- location: results/UTR/validate-netcode.gameobjects-6000.0-windows
+ location: results/UTR/validate-netcode.gameobjects-6000.0-win10
unzip: true
variables:
UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
- UPMPVP_CONTEXT_WRENCH: 1.4.8.0
+ UPMPVP_CONTEXT_WRENCH: 2.2.0.0
metadata:
Job Maintainers: '#rm-packageworks'
- Wrench: 1.4.8.0
+ Wrench: 2.2.0.0
diff --git a/.yamato/wrench/recipe-regeneration.yml b/.yamato/wrench/recipe-regeneration.yml
index 75795b3eba..6d05b72acd 100644
--- a/.yamato/wrench/recipe-regeneration.yml
+++ b/.yamato/wrench/recipe-regeneration.yml
@@ -5,7 +5,7 @@
test_-_wrench_jobs_up_to_date:
name: Test - Wrench Jobs up to date
agent:
- image: package-ci/ubuntu-20.04:default
+ image: package-ci/ubuntu-20.04:v4
type: Unity::VM
flavor: b1.large
commands:
@@ -26,5 +26,5 @@ test_-_wrench_jobs_up_to_date:
cancel_old_ci: true
metadata:
Job Maintainers: '#rm-packageworks'
- Wrench: 1.4.8.0
+ Wrench: 2.2.0.0
diff --git a/.yamato/wrench/validation-jobs.yml b/.yamato/wrench/validation-jobs.yml
index ec69e8e30a..75d1fa749d 100644
--- a/.yamato/wrench/validation-jobs.yml
+++ b/.yamato/wrench/validation-jobs.yml
@@ -1,13 +1,13 @@
# 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
-# PVP Editor and Playmode tests for Validate - netcode.gameobjects - 2022.3 - macos (2022.3 - MacOS).
-validate_-_netcode_gameobjects_-_2022_3_-_macos:
- name: Validate - netcode.gameobjects - 2022.3 - macos
+# PVP Editor and Playmode tests for Validate - netcode.gameobjects - 2022.3 - macos13 (2022.3 - MacOS).
+validate_-_netcode_gameobjects_-_2022_3_-_macos13:
+ name: Validate - netcode.gameobjects - 2022.3 - macos13
agent:
- image: package-ci/macos-13:default
+ image: package-ci/macos-13:v4
type: Unity::VM::osx
- flavor: b1.xlarge
+ flavor: b1.large
commands:
- command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.zip -o wrench-localapv.zip
- command: 7z x -aoa wrench-localapv.zip
@@ -64,18 +64,18 @@ validate_-_netcode_gameobjects_-_2022_3_-_macos:
UNITY_LICENSING_SERVER_DELETE_ULF: 0
UNITY_LICENSING_SERVER_TOOLSET: pro
UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
- UPMPVP_CONTEXT_WRENCH: 1.4.8.0
+ UPMPVP_CONTEXT_WRENCH: 2.2.0.0
metadata:
Job Maintainers: '#rm-packageworks'
- Wrench: 1.4.8.0
+ Wrench: 2.2.0.0
labels:
- Packages:netcode.gameobjects
-# PVP Editor and Playmode tests for Validate - netcode.gameobjects - 2022.3 - ubuntu (2022.3 - Ubuntu).
-validate_-_netcode_gameobjects_-_2022_3_-_ubuntu:
- name: Validate - netcode.gameobjects - 2022.3 - ubuntu
+# PVP Editor and Playmode tests for Validate - netcode.gameobjects - 2022.3 - ubuntu1804 (2022.3 - Ubuntu).
+validate_-_netcode_gameobjects_-_2022_3_-_ubuntu1804:
+ name: Validate - netcode.gameobjects - 2022.3 - ubuntu1804
agent:
- image: package-ci/ubuntu-20.04:default
+ image: package-ci/ubuntu-18.04:v4
type: Unity::VM
flavor: b1.large
commands:
@@ -134,20 +134,20 @@ validate_-_netcode_gameobjects_-_2022_3_-_ubuntu:
UNITY_LICENSING_SERVER_DELETE_ULF: 0
UNITY_LICENSING_SERVER_TOOLSET: pro
UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
- UPMPVP_CONTEXT_WRENCH: 1.4.8.0
+ UPMPVP_CONTEXT_WRENCH: 2.2.0.0
metadata:
Job Maintainers: '#rm-packageworks'
- Wrench: 1.4.8.0
+ Wrench: 2.2.0.0
labels:
- Packages:netcode.gameobjects
-# PVP Editor and Playmode tests for Validate - netcode.gameobjects - 2022.3 - windows (2022.3 - Windows).
-validate_-_netcode_gameobjects_-_2022_3_-_windows:
- name: Validate - netcode.gameobjects - 2022.3 - windows
+# PVP Editor and Playmode tests for Validate - netcode.gameobjects - 2022.3 - win10 (2022.3 - Windows).
+validate_-_netcode_gameobjects_-_2022_3_-_win10:
+ name: Validate - netcode.gameobjects - 2022.3 - win10
agent:
- image: package-ci/win10:default
+ image: package-ci/win10:v4
type: Unity::VM
- flavor: b1.large
+ flavor: b1.xlarge
commands:
- command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.zip -o wrench-localapv.zip
- command: 7z x -aoa wrench-localapv.zip
@@ -204,20 +204,20 @@ validate_-_netcode_gameobjects_-_2022_3_-_windows:
UNITY_LICENSING_SERVER_DELETE_ULF: 0
UNITY_LICENSING_SERVER_TOOLSET: pro
UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
- UPMPVP_CONTEXT_WRENCH: 1.4.8.0
+ UPMPVP_CONTEXT_WRENCH: 2.2.0.0
metadata:
Job Maintainers: '#rm-packageworks'
- Wrench: 1.4.8.0
+ Wrench: 2.2.0.0
labels:
- Packages:netcode.gameobjects
-# PVP Editor and Playmode tests for Validate - netcode.gameobjects - 6000.0 - macos (6000.0 - MacOS).
-validate_-_netcode_gameobjects_-_6000_0_-_macos:
- name: Validate - netcode.gameobjects - 6000.0 - macos
+# PVP Editor and Playmode tests for Validate - netcode.gameobjects - 6000.0 - macos13 (6000.0 - MacOS).
+validate_-_netcode_gameobjects_-_6000_0_-_macos13:
+ name: Validate - netcode.gameobjects - 6000.0 - macos13
agent:
- image: package-ci/macos-13:default
+ image: package-ci/macos-13:v4
type: Unity::VM::osx
- flavor: b1.xlarge
+ flavor: b1.large
commands:
- command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.zip -o wrench-localapv.zip
- command: 7z x -aoa wrench-localapv.zip
@@ -274,16 +274,16 @@ validate_-_netcode_gameobjects_-_6000_0_-_macos:
UNITY_LICENSING_SERVER_DELETE_ULF: 0
UNITY_LICENSING_SERVER_TOOLSET: pro
UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
- UPMPVP_CONTEXT_WRENCH: 1.4.8.0
+ UPMPVP_CONTEXT_WRENCH: 2.2.0.0
metadata:
Job Maintainers: '#rm-packageworks'
- Wrench: 1.4.8.0
+ Wrench: 2.2.0.0
labels:
- Packages:netcode.gameobjects
-# PVP Editor and Playmode tests for Validate - netcode.gameobjects - 6000.0 - ubuntu (6000.0 - Ubuntu).
-validate_-_netcode_gameobjects_-_6000_0_-_ubuntu:
- name: Validate - netcode.gameobjects - 6000.0 - ubuntu
+# PVP Editor and Playmode tests for Validate - netcode.gameobjects - 6000.0 - ubuntu2204 (6000.0 - Ubuntu).
+validate_-_netcode_gameobjects_-_6000_0_-_ubuntu2204:
+ name: Validate - netcode.gameobjects - 6000.0 - ubuntu2204
agent:
image: package-ci/ubuntu-22.04:v4
type: Unity::VM
@@ -344,20 +344,20 @@ validate_-_netcode_gameobjects_-_6000_0_-_ubuntu:
UNITY_LICENSING_SERVER_DELETE_ULF: 0
UNITY_LICENSING_SERVER_TOOLSET: pro
UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
- UPMPVP_CONTEXT_WRENCH: 1.4.8.0
+ UPMPVP_CONTEXT_WRENCH: 2.2.0.0
metadata:
Job Maintainers: '#rm-packageworks'
- Wrench: 1.4.8.0
+ Wrench: 2.2.0.0
labels:
- Packages:netcode.gameobjects
-# PVP Editor and Playmode tests for Validate - netcode.gameobjects - 6000.0 - windows (6000.0 - Windows).
-validate_-_netcode_gameobjects_-_6000_0_-_windows:
- name: Validate - netcode.gameobjects - 6000.0 - windows
+# PVP Editor and Playmode tests for Validate - netcode.gameobjects - 6000.0 - win10 (6000.0 - Windows).
+validate_-_netcode_gameobjects_-_6000_0_-_win10:
+ name: Validate - netcode.gameobjects - 6000.0 - win10
agent:
- image: package-ci/win10:default
+ image: package-ci/win10:v4
type: Unity::VM
- flavor: b1.large
+ flavor: b1.xlarge
commands:
- command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.zip -o wrench-localapv.zip
- command: 7z x -aoa wrench-localapv.zip
@@ -414,10 +414,10 @@ validate_-_netcode_gameobjects_-_6000_0_-_windows:
UNITY_LICENSING_SERVER_DELETE_ULF: 0
UNITY_LICENSING_SERVER_TOOLSET: pro
UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
- UPMPVP_CONTEXT_WRENCH: 1.4.8.0
+ UPMPVP_CONTEXT_WRENCH: 2.2.0.0
metadata:
Job Maintainers: '#rm-packageworks'
- Wrench: 1.4.8.0
+ Wrench: 2.2.0.0
labels:
- Packages:netcode.gameobjects
diff --git a/.yamato/wrench/wrench_config.json b/.yamato/wrench/wrench_config.json
index ffeb4924d0..bd9dcf710b 100644
--- a/.yamato/wrench/wrench_config.json
+++ b/.yamato/wrench/wrench_config.json
@@ -5,9 +5,16 @@
"directory": "com.unity.netcode.gameobjects/",
"prePackCommands": [],
"preTestCommands": {
- "MacOS": [],
- "Ubuntu": [],
- "Windows": []
+ "MacOs13": [],
+ "MacOs13Arm": [],
+ "Ubuntu1804": [],
+ "Ubuntu2004": [],
+ "Ubuntu2204": [],
+ "Win10": [],
+ "Win10GPU": [],
+ "Win11": [],
+ "Win11Arm": [],
+ "Win11GPU": []
},
"InternalOnly": false,
"NeverPublish": false,
@@ -25,14 +32,14 @@
],
"jobs_to_monitor": {
"com.unity.netcode.gameobjects": [
- ".yamato/wrench/api-validation-jobs.yml#api_validation_-_netcode_gameobjects_-_2022_3_-_windows",
+ ".yamato/wrench/api-validation-jobs.yml#api_validation_-_netcode_gameobjects_-_2022_3_-_win10",
".yamato/wrench/preview-a-p-v.yml#all_preview_apv_jobs",
".yamato/wrench/promotion-jobs.yml#publish_dry_run_netcode_gameobjects"
]
},
"publishing_job": ".yamato/wrench/promotion-jobs.yml#publish_netcode_gameobjects",
"branch_pattern": "ReleaseSlash",
- "wrench_version": "1.4.8.0",
+ "wrench_version": "2.2.0.0",
"pvp_exemption_path": ".yamato/wrench/pvp-exemptions.json",
"cs_project_path": "Tools/CI/NGO.Cookbook.csproj"
}
\ No newline at end of file
diff --git a/Tools/CI/NGO.Cookbook.csproj b/Tools/CI/NGO.Cookbook.csproj
index d3291b665e..85f643135b 100644
--- a/Tools/CI/NGO.Cookbook.csproj
+++ b/Tools/CI/NGO.Cookbook.csproj
@@ -8,11 +8,11 @@
-
-
+
+
-
+
diff --git a/Tools/CI/Settings/NGOSettings.cs b/Tools/CI/Settings/NGOSettings.cs
index 1a25c41b04..b949dbecca 100644
--- a/Tools/CI/Settings/NGOSettings.cs
+++ b/Tools/CI/Settings/NGOSettings.cs
@@ -1,5 +1,6 @@
using RecipeEngine.Api.Settings;
using RecipeEngine.Modules.Wrench.Models;
+using RecipeEngine.Modules.Wrench.Platforms;
using RecipeEngine.Modules.Wrench.Settings;
namespace NGO.Cookbook.Settings;
@@ -31,12 +32,9 @@ public class NGOSettings : AnnotatedSettingsBase
public NGOSettings()
{
- Wrench = new WrenchSettings(
- packagesRootPaths,
- PackageOptions
- );
-
+ Wrench = new WrenchSettings(packagesRootPaths, PackageOptions);
Wrench.PvpProfilesToCheck = new HashSet() { "supported" };
+ Wrench.Packages["com.unity.netcode.gameobjects"].PackAndPromotePlatformType = EditorPlatformType.Ubuntu2204;
}
public WrenchSettings Wrench { get; private set; }