diff --git a/.yamato/wrench/api-validation-jobs.yml b/.yamato/wrench/api-validation-jobs.yml index 9f518da240..d3d8bb78e9 100644 --- a/.yamato/wrench/api-validation-jobs.yml +++ b/.yamato/wrench/api-validation-jobs.yml @@ -1,5 +1,9 @@ # 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 +all_api_validation_jobs: + name: All API Validation Jobs + dependencies: + - path: .yamato/wrench/api-validation-jobs.yml#api_validation_-_netcode_gameobjects_-_6000_0_-_windows # upm-ci validation tests for API Validation - netcode.gameobjects - 6000.0 - windows (6000.0 - Windows). api_validation_-_netcode_gameobjects_-_6000_0_-_windows: @@ -47,11 +51,8 @@ api_validation_-_netcode_gameobjects_-_6000_0_-_windows: dependencies: - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects variables: - UPMPVP_CONTEXT_WRENCH: 0.10.38.0 - triggers: - expression: push.branch match "^release/.*" - cancel_old_ci: true + UPMPVP_CONTEXT_WRENCH: 0.10.39.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 0.10.38.0 + Wrench: 0.10.39.0 diff --git a/.yamato/wrench/package-pack-jobs.yml b/.yamato/wrench/package-pack-jobs.yml index 6e87bc64cf..34471effd9 100644 --- a/.yamato/wrench/package-pack-jobs.yml +++ b/.yamato/wrench/package-pack-jobs.yml @@ -24,5 +24,5 @@ package_pack_-_netcode_gameobjects: UPMCI_ACK_LARGE_PACKAGE: 1 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 0.10.38.0 + Wrench: 0.10.39.0 diff --git a/.yamato/wrench/preview-a-p-v.yml b/.yamato/wrench/preview-a-p-v.yml index c834cdd555..ee5c303553 100644 --- a/.yamato/wrench/preview-a-p-v.yml +++ b/.yamato/wrench/preview-a-p-v.yml @@ -14,12 +14,9 @@ all_preview_apv_jobs: - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_2_-_macos - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_2_-_ubuntu - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_2_-_windows - triggers: - expression: push.branch match "^release/.*" - cancel_old_ci: true metadata: Job Maintainers: '#rm-packageworks' - Wrench: 0.10.38.0 + Wrench: 0.10.39.0 # Functional tests for dependents found in the latest 6000.0 manifest (MacOS). preview_apv_-_6000_0_-_macos: @@ -70,10 +67,10 @@ preview_apv_-_6000_0_-_macos: dependencies: - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects variables: - UPMPVP_CONTEXT_WRENCH: 0.10.38.0 + UPMPVP_CONTEXT_WRENCH: 0.10.39.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 0.10.38.0 + Wrench: 0.10.39.0 # Functional tests for dependents found in the latest 6000.0 manifest (Ubuntu). preview_apv_-_6000_0_-_ubuntu: @@ -124,10 +121,10 @@ preview_apv_-_6000_0_-_ubuntu: dependencies: - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects variables: - UPMPVP_CONTEXT_WRENCH: 0.10.38.0 + UPMPVP_CONTEXT_WRENCH: 0.10.39.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 0.10.38.0 + Wrench: 0.10.39.0 # Functional tests for dependents found in the latest 6000.0 manifest (Windows). preview_apv_-_6000_0_-_windows: @@ -179,10 +176,10 @@ preview_apv_-_6000_0_-_windows: dependencies: - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects variables: - UPMPVP_CONTEXT_WRENCH: 0.10.38.0 + UPMPVP_CONTEXT_WRENCH: 0.10.39.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 0.10.38.0 + Wrench: 0.10.39.0 # Functional tests for dependents found in the latest 6000.1 manifest (MacOS). preview_apv_-_6000_1_-_macos: @@ -233,10 +230,10 @@ preview_apv_-_6000_1_-_macos: dependencies: - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects variables: - UPMPVP_CONTEXT_WRENCH: 0.10.38.0 + UPMPVP_CONTEXT_WRENCH: 0.10.39.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 0.10.38.0 + Wrench: 0.10.39.0 # Functional tests for dependents found in the latest 6000.1 manifest (Ubuntu). preview_apv_-_6000_1_-_ubuntu: @@ -287,10 +284,10 @@ preview_apv_-_6000_1_-_ubuntu: dependencies: - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects variables: - UPMPVP_CONTEXT_WRENCH: 0.10.38.0 + UPMPVP_CONTEXT_WRENCH: 0.10.39.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 0.10.38.0 + Wrench: 0.10.39.0 # Functional tests for dependents found in the latest 6000.1 manifest (Windows). preview_apv_-_6000_1_-_windows: @@ -342,10 +339,10 @@ preview_apv_-_6000_1_-_windows: dependencies: - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects variables: - UPMPVP_CONTEXT_WRENCH: 0.10.38.0 + UPMPVP_CONTEXT_WRENCH: 0.10.39.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 0.10.38.0 + Wrench: 0.10.39.0 # Functional tests for dependents found in the latest 6000.2 manifest (MacOS). preview_apv_-_6000_2_-_macos: @@ -396,10 +393,10 @@ preview_apv_-_6000_2_-_macos: dependencies: - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects variables: - UPMPVP_CONTEXT_WRENCH: 0.10.38.0 + UPMPVP_CONTEXT_WRENCH: 0.10.39.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 0.10.38.0 + Wrench: 0.10.39.0 # Functional tests for dependents found in the latest 6000.2 manifest (Ubuntu). preview_apv_-_6000_2_-_ubuntu: @@ -450,10 +447,10 @@ preview_apv_-_6000_2_-_ubuntu: dependencies: - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects variables: - UPMPVP_CONTEXT_WRENCH: 0.10.38.0 + UPMPVP_CONTEXT_WRENCH: 0.10.39.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 0.10.38.0 + Wrench: 0.10.39.0 # Functional tests for dependents found in the latest 6000.2 manifest (Windows). preview_apv_-_6000_2_-_windows: @@ -505,8 +502,8 @@ preview_apv_-_6000_2_-_windows: dependencies: - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects variables: - UPMPVP_CONTEXT_WRENCH: 0.10.38.0 + UPMPVP_CONTEXT_WRENCH: 0.10.39.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 0.10.38.0 + Wrench: 0.10.39.0 diff --git a/.yamato/wrench/promotion-jobs.yml b/.yamato/wrench/promotion-jobs.yml index d4230d9ec9..81f9fe8cce 100644 --- a/.yamato/wrench/promotion-jobs.yml +++ b/.yamato/wrench/promotion-jobs.yml @@ -100,13 +100,10 @@ publish_dry_run_netcode_gameobjects: unzip: true variables: UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 0.10.38.0 - triggers: - expression: push.branch match "^release/.*" - cancel_old_ci: true + UPMPVP_CONTEXT_WRENCH: 0.10.39.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 0.10.38.0 + Wrench: 0.10.39.0 # Publish for netcode.gameobjects to https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-npm publish_netcode_gameobjects: @@ -207,8 +204,8 @@ publish_netcode_gameobjects: unzip: true variables: UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 0.10.38.0 + UPMPVP_CONTEXT_WRENCH: 0.10.39.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 0.10.38.0 + Wrench: 0.10.39.0 diff --git a/.yamato/wrench/publish-trigger.yml b/.yamato/wrench/publish-trigger.yml new file mode 100644 index 0000000000..e71b6ed8cd --- /dev/null +++ b/.yamato/wrench/publish-trigger.yml @@ -0,0 +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 +all_promotion_related_jobs_promotiontrigger: + name: All Promotion Related Jobs PromotionTrigger + dependencies: + - path: .yamato/wrench/api-validation-jobs.yml#all_api_validation_jobs + - path: .yamato/wrench/preview-a-p-v.yml#all_preview_apv_jobs + - path: .yamato/wrench/promotion-jobs.yml#publish_dry_run_netcode_gameobjects + - path: .yamato/wrench/promotion-jobs.yml#publish_netcode_gameobjects + triggers: + expression: push.branch match "^release/.*" + cancel_old_ci: true + diff --git a/.yamato/wrench/recipe-regeneration.yml b/.yamato/wrench/recipe-regeneration.yml index e0fe34e545..e1cfad39db 100644 --- a/.yamato/wrench/recipe-regeneration.yml +++ b/.yamato/wrench/recipe-regeneration.yml @@ -26,5 +26,5 @@ test_-_wrench_jobs_up_to_date: cancel_old_ci: true metadata: Job Maintainers: '#rm-packageworks' - Wrench: 0.10.38.0 + Wrench: 0.10.39.0 diff --git a/.yamato/wrench/validation-jobs.yml b/.yamato/wrench/validation-jobs.yml index 2f0430cec7..cad9547e17 100644 --- a/.yamato/wrench/validation-jobs.yml +++ b/.yamato/wrench/validation-jobs.yml @@ -60,10 +60,10 @@ validate_-_netcode_gameobjects_-_6000_0_-_macos: - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects variables: UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 0.10.38.0 + UPMPVP_CONTEXT_WRENCH: 0.10.39.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 0.10.38.0 + Wrench: 0.10.39.0 labels: - Packages:netcode.gameobjects @@ -126,10 +126,10 @@ validate_-_netcode_gameobjects_-_6000_0_-_ubuntu: - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects variables: UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 0.10.38.0 + UPMPVP_CONTEXT_WRENCH: 0.10.39.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 0.10.38.0 + Wrench: 0.10.39.0 labels: - Packages:netcode.gameobjects @@ -192,10 +192,10 @@ validate_-_netcode_gameobjects_-_6000_0_-_windows: - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects variables: UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 0.10.38.0 + UPMPVP_CONTEXT_WRENCH: 0.10.39.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 0.10.38.0 + Wrench: 0.10.39.0 labels: - Packages:netcode.gameobjects @@ -258,10 +258,10 @@ validate_-_netcode_gameobjects_-_6000_1_-_macos: - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects variables: UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 0.10.38.0 + UPMPVP_CONTEXT_WRENCH: 0.10.39.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 0.10.38.0 + Wrench: 0.10.39.0 labels: - Packages:netcode.gameobjects @@ -324,10 +324,10 @@ validate_-_netcode_gameobjects_-_6000_1_-_ubuntu: - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects variables: UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 0.10.38.0 + UPMPVP_CONTEXT_WRENCH: 0.10.39.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 0.10.38.0 + Wrench: 0.10.39.0 labels: - Packages:netcode.gameobjects @@ -390,10 +390,10 @@ validate_-_netcode_gameobjects_-_6000_1_-_windows: - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects variables: UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 0.10.38.0 + UPMPVP_CONTEXT_WRENCH: 0.10.39.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 0.10.38.0 + Wrench: 0.10.39.0 labels: - Packages:netcode.gameobjects @@ -456,10 +456,10 @@ validate_-_netcode_gameobjects_-_6000_2_-_macos: - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects variables: UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 0.10.38.0 + UPMPVP_CONTEXT_WRENCH: 0.10.39.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 0.10.38.0 + Wrench: 0.10.39.0 labels: - Packages:netcode.gameobjects @@ -522,10 +522,10 @@ validate_-_netcode_gameobjects_-_6000_2_-_ubuntu: - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects variables: UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 0.10.38.0 + UPMPVP_CONTEXT_WRENCH: 0.10.39.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 0.10.38.0 + Wrench: 0.10.39.0 labels: - Packages:netcode.gameobjects @@ -588,10 +588,10 @@ validate_-_netcode_gameobjects_-_6000_2_-_windows: - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects variables: UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 0.10.38.0 + UPMPVP_CONTEXT_WRENCH: 0.10.39.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 0.10.38.0 + Wrench: 0.10.39.0 labels: - Packages:netcode.gameobjects diff --git a/.yamato/wrench/wrench_config.json b/.yamato/wrench/wrench_config.json index d8197acdfe..c437896ae6 100644 --- a/.yamato/wrench/wrench_config.json +++ b/.yamato/wrench/wrench_config.json @@ -31,7 +31,7 @@ }, "publishing_job": ".yamato/wrench/promotion-jobs.yml#publish_netcode_gameobjects", "branch_pattern": "ReleaseSlash", - "wrench_version": "0.10.38.0", + "wrench_version": "0.10.39.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 c9f598a055..17a0aec1e8 100644 --- a/Tools/CI/NGO.Cookbook.csproj +++ b/Tools/CI/NGO.Cookbook.csproj @@ -8,7 +8,7 @@ - +