Skip to content

Commit 5ac6cb1

Browse files
Pauliusd01Pauliusd01
committed
Merge branch 'develop' into release/1.X
2 parents b026bb7 + f58b597 commit 5ac6cb1

File tree

60 files changed

+2476
-680
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+2476
-680
lines changed

‎.yamato/config.metadata

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
editors:
22
- version: 2021.3
33
- version: 2022.3
4-
disable_tvos_run: true
4+
run_tvos: false
55
- version: 6000.0
6-
disable_tvos_run: true
6+
run_tvos: false
77
- version: 6000.1
8-
disable_tvos_run: true
8+
run_tvos: false
99
- version: trunk
10-
disable_tvos_run: true
10+
run_tvos: false
1111

1212
utr_install_win: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output utr.bat
1313
utr_install_nix: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr && chmod +x utr
@@ -80,7 +80,7 @@ ios_and_tvos_macos_bokken_image: package-ci/macos-13:v4.50.0
8080

8181
test_category:
8282
- name: performance
83-
- name: all
83+
- name: functional
8484

8585
instabilities_install_win: curl -s https://artifactory.prd.it.unity3d.com/artifactory/automation-and-tooling/infrastructure-instability-detection/standalone/setup/run_standalone_instability_detection-latest.bat --output run_standalone_instability_detection-latest.bat --retry 5 || exit 0
8686
instabilities_run_win: run_standalone_instability_detection-latest.bat 0.5.1 || exit 0

‎.yamato/upm-ci.yml

Lines changed: 53 additions & 70 deletions
Large diffs are not rendered by default.

‎.yamato/wrench/api-validation-jobs.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# Auto-generated by Recipe Engine, do not modify manually.
22
# This job is generated by the wrench recipe engine module, see find the docs here: http://Go/ii2fb
3+
all_api_validation_jobs:
4+
name: All API Validation Jobs
5+
dependencies:
6+
- path: .yamato/wrench/api-validation-jobs.yml#api_validation_-_inputsystem_-_2021_3_-_windows
37

48
# upm-ci validation tests for API Validation - inputsystem - 2021.3 - windows (2021.3 - Windows).
59
api_validation_-_inputsystem_-_2021_3_-_windows:
@@ -9,7 +13,7 @@ api_validation_-_inputsystem_-_2021_3_-_windows:
913
type: Unity::VM
1014
flavor: b1.large
1115
commands:
12-
- command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-56_6391218b3c9a0a6d36cd0b122ff5dd48d68381a518cd09da6f7279c68a7c7962.zip -o wrench-localapv.zip
16+
- command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-59_594aea2e5eb3a7468ad88458b5c5da2e5e72af0d2267db7b025602fb69e57bd7.zip -o wrench-localapv.zip
1317
- command: 7z x -aoa wrench-localapv.zip
1418
- command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple
1519
- command: python PythonScripts/print_machine_info.py
@@ -47,11 +51,8 @@ api_validation_-_inputsystem_-_2021_3_-_windows:
4751
dependencies:
4852
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_inputsystem
4953
variables:
50-
UPMPVP_CONTEXT_WRENCH: 0.10.37.0
51-
triggers:
52-
expression: push.branch match "^release/.*"
53-
cancel_old_ci: true
54+
UPMPVP_CONTEXT_WRENCH: 0.10.43.0
5455
metadata:
5556
Job Maintainers: '#rm-packageworks'
56-
Wrench: 0.10.37.0
57+
Wrench: 0.10.43.0
5758

‎.yamato/wrench/package-pack-jobs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,5 @@ package_pack_-_inputsystem:
2626
UPMCI_ACK_LARGE_PACKAGE: 1
2727
metadata:
2828
Job Maintainers: '#rm-packageworks'
29-
Wrench: 0.10.37.0
29+
Wrench: 0.10.43.0
3030

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

Lines changed: 46 additions & 49 deletions
Large diffs are not rendered by default.

‎.yamato/wrench/promotion-jobs.yml

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ publish_dry_run_inputsystem:
99
type: Unity::VM
1010
flavor: b1.large
1111
commands:
12-
- command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-56_6391218b3c9a0a6d36cd0b122ff5dd48d68381a518cd09da6f7279c68a7c7962.zip -o wrench-localapv.zip
12+
- command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-59_594aea2e5eb3a7468ad88458b5c5da2e5e72af0d2267db7b025602fb69e57bd7.zip -o wrench-localapv.zip
1313
- command: 7z x -aoa wrench-localapv.zip
1414
- command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple
1515
- command: python PythonScripts/print_machine_info.py
@@ -148,13 +148,10 @@ publish_dry_run_inputsystem:
148148
unzip: true
149149
variables:
150150
UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
151-
UPMPVP_CONTEXT_WRENCH: 0.10.37.0
152-
triggers:
153-
expression: push.branch match "^release/.*"
154-
cancel_old_ci: true
151+
UPMPVP_CONTEXT_WRENCH: 0.10.43.0
155152
metadata:
156153
Job Maintainers: '#rm-packageworks'
157-
Wrench: 0.10.37.0
154+
Wrench: 0.10.43.0
158155

159156
# Publish for inputsystem to https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-npm
160157
publish_inputsystem:
@@ -164,7 +161,7 @@ publish_inputsystem:
164161
type: Unity::VM
165162
flavor: b1.large
166163
commands:
167-
- command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-56_6391218b3c9a0a6d36cd0b122ff5dd48d68381a518cd09da6f7279c68a7c7962.zip -o wrench-localapv.zip
164+
- command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-59_594aea2e5eb3a7468ad88458b5c5da2e5e72af0d2267db7b025602fb69e57bd7.zip -o wrench-localapv.zip
168165
- command: 7z x -aoa wrench-localapv.zip
169166
- command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple
170167
- command: python PythonScripts/print_machine_info.py
@@ -303,8 +300,8 @@ publish_inputsystem:
303300
unzip: true
304301
variables:
305302
UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
306-
UPMPVP_CONTEXT_WRENCH: 0.10.37.0
303+
UPMPVP_CONTEXT_WRENCH: 0.10.43.0
307304
metadata:
308305
Job Maintainers: '#rm-packageworks'
309-
Wrench: 0.10.37.0
306+
Wrench: 0.10.43.0
310307

‎.yamato/wrench/publish-trigger.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# Auto-generated by Recipe Engine, do not modify manually.
2+
# This job is generated by the wrench recipe engine module, see find the docs here: http://Go/ii2fb
3+
all_promotion_related_jobs_promotiontrigger:
4+
name: All Promotion Related Jobs PromotionTrigger
5+
dependencies:
6+
- path: .yamato/wrench/api-validation-jobs.yml#all_api_validation_jobs
7+
- path: .yamato/wrench/preview-a-p-v.yml#all_preview_apv_jobs
8+
- path: .yamato/wrench/promotion-jobs.yml#publish_dry_run_inputsystem
9+
triggers:
10+
expression: push.branch match "^release/.*"
11+
cancel_old_ci: true
12+

‎.yamato/wrench/recipe-regeneration.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ test_-_wrench_jobs_up_to_date:
1111
commands:
1212
- command: dotnet run --project Tools/CI/InputSystem.Cookbook.csproj
1313
- command: |-
14-
if [ -n "$(git status --porcelain)" ]; then
14+
if [ -n "$(git status --porcelain -- .yamato/wrench)" ]; then
1515
git status
1616
echo "Your repo is not clean - diff output:"
1717
git diff
@@ -26,5 +26,5 @@ test_-_wrench_jobs_up_to_date:
2626
cancel_old_ci: true
2727
metadata:
2828
Job Maintainers: '#rm-packageworks'
29-
Wrench: 0.10.37.0
29+
Wrench: 0.10.43.0
3030

0 commit comments

Comments
 (0)