Merge branch 'develop' into pvp-fixes-develop

Author: michalChrobot

.github/workflows/conventional-pr.yml

@@ -1,6 +1,6 @@
 name: Conventional PR
 
-# Controls when the action will run. 
+# Controls when the action will run.
 on:
   pull_request:
     branches:
@@ -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@b7a9a97cb10fa6e1ae02647e718798175f6b1f1d
+        uses: amannn/action-semantic-pull-request@v5
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
@@ -34,4 +34,4 @@ jobs:
           # For work-in-progress PRs you can typically use draft pull requests from Github. However, private repositories on the free plan don't have this option and therefore this action allows you to opt-in to using the special '[WIP]' prefix to indicate this state. This will avoid the validation of the PR title and the pull request checks remain pending. Note that a second check will be reported if this is enabled.
           #wip: # optional
           # When using "Squash and merge" on a PR with only one commit, GitHub will suggest using that commit message instead of the PR title for the merge commit, and it's easy to commit this by mistake. Enable this option to also validate the commit message for one commit PRs.
-          validateSingleCommit: true # optional
+          # validateSingleCommit: true # optional

.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_-_2021_3_-_windows
 
 # upm-ci validation tests for API Validation - netcode.gameobjects - 2021.3 - windows (2021.3 - Windows).
 api_validation_-_netcode_gameobjects_-_2021_3_-_windows:
@@ -9,7 +13,7 @@ api_validation_-_netcode_gameobjects_-_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-56_6391218b3c9a0a6d36cd0b122ff5dd48d68381a518cd09da6f7279c68a7c7962.zip -o wrench-localapv.zip
+  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-58_ab06748e39f9b01f55b979c0c06d7c1f787e07cbca4dc6ae5eef274fd195612a.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
@@ -47,11 +51,8 @@ api_validation_-_netcode_gameobjects_-_2021_3_-_windows:
   dependencies:
   - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
   variables:
-    UPMPVP_CONTEXT_WRENCH: 0.10.37.0
-  triggers:
-    expression: push.branch match "^release/.*"
-    cancel_old_ci: true
+    UPMPVP_CONTEXT_WRENCH: 0.10.40.0
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 0.10.37.0
+    Wrench: 0.10.40.0
 

.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.37.0
+    Wrench: 0.10.40.0
 

.yamato/wrench/preview-a-p-v.yml

@@ -9,7 +9,7 @@ publish_dry_run_netcode_gameobjects:
     type: Unity::VM
     flavor: b1.large
   commands:
-  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-56_6391218b3c9a0a6d36cd0b122ff5dd48d68381a518cd09da6f7279c68a7c7962.zip -o wrench-localapv.zip
+  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-58_ab06748e39f9b01f55b979c0c06d7c1f787e07cbca4dc6ae5eef274fd195612a.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
@@ -148,13 +148,10 @@ publish_dry_run_netcode_gameobjects:
         unzip: true
   variables:
     UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
-    UPMPVP_CONTEXT_WRENCH: 0.10.37.0
-  triggers:
-    expression: push.branch match "^release/.*"
-    cancel_old_ci: true
+    UPMPVP_CONTEXT_WRENCH: 0.10.40.0
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 0.10.37.0
+    Wrench: 0.10.40.0
 
 # Publish  for netcode.gameobjects to https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-npm
 publish_netcode_gameobjects:
@@ -164,7 +161,7 @@ publish_netcode_gameobjects:
     type: Unity::VM
     flavor: b1.large
   commands:
-  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-56_6391218b3c9a0a6d36cd0b122ff5dd48d68381a518cd09da6f7279c68a7c7962.zip -o wrench-localapv.zip
+  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-58_ab06748e39f9b01f55b979c0c06d7c1f787e07cbca4dc6ae5eef274fd195612a.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
@@ -303,8 +300,8 @@ publish_netcode_gameobjects:
         unzip: true
   variables:
     UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
-    UPMPVP_CONTEXT_WRENCH: 0.10.37.0
+    UPMPVP_CONTEXT_WRENCH: 0.10.40.0
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 0.10.37.0
+    Wrench: 0.10.40.0
 

.yamato/wrench/promotion-jobs.yml

@@ -0,0 +1,12 @@
+# 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
+  triggers:
+    expression: push.branch match "^release/.*"
+    cancel_old_ci: true
+

.yamato/wrench/publish-trigger.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)" ]; then
         git status
         echo "Your repo is not clean - diff output:"
         git diff
         echo "You must run recipe generation after updating recipes to update the generated YAML!"
-        echo "Run 'dotnet run --project Tools/CI/NGO.Cookbook.csproj' from the root of your repository to regenerate all job definitions created by wrench."
+        echo "Run 'dotnet run --project Tools\CI\NGO.Cookbook.csproj' from the root of your repository to regenerate all job definitions created by wrench."
         exit 1
       fi
   variables:
@@ -26,5 +26,5 @@ test_-_wrench_jobs_up_to_date:
     cancel_old_ci: true
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 0.10.37.0
+    Wrench: 0.10.40.0