Skip to content

Commit 0d71d6a

Browse files
Pauliusd01Pauliusd01
committed
Merge branch 'develop' into release/1.X
2 parents 5f79385 + b40d8c1 commit 0d71d6a

30 files changed

+828
-244
lines changed

‎.yamato/config.metadata

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ editors:
99
- version: 6000.2
1010
run_tvos: false
1111
- version: trunk
12-
run_tvos: false
12+
run_tvos: false
1313

1414
utr_install_win: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output utr.bat
1515
utr_install_nix: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr && chmod +x utr
@@ -57,18 +57,18 @@ platforms_nix:
5757
installscript: unity-downloader-cli -c editor -c StandaloneSupport-IL2CPP --wait --fast -u
5858
- name: linux
5959
type: Unity::VM
60-
image: package-ci/ubuntu-20.04:v4.50.0
60+
image: package-ci/ubuntu-20.04:v4
6161
flavor: b1.large
6262
instabilities_run: sh ./run_standalone_instability_detection-latest.sh ubuntu 0.5.1 || exit 0
6363
- name: linux_standalone
6464
type: Unity::VM
65-
image: package-ci/ubuntu-20.04:v4.50.0
65+
image: package-ci/ubuntu-20.04:v4
6666
flavor: b1.large
6767
instabilities_run: sh ./run_standalone_instability_detection-latest.sh ubuntu 0.5.1 || exit 0
6868
runtime: StandaloneLinux64
6969
- name: linux_standalone_il2cpp
7070
type: Unity::VM
71-
image: package-ci/ubuntu-20.04:v4.50.0
71+
image: package-ci/ubuntu-20.04:v4
7272
flavor: b1.large
7373
instabilities_run: sh ./run_standalone_instability_detection-latest.sh ubuntu 0.5.1 || exit 0
7474
runtime: StandaloneLinux64
@@ -78,7 +78,7 @@ scripting_backends:
7878
- name: mono
7979
- name: il2cpp
8080

81-
ios_and_tvos_macos_bokken_image: package-ci/macos-13:v4.50.0
81+
ios_and_tvos_macos_bokken_image: package-ci/macos-13:v4
8282

8383
test_category:
8484
- name: performance

‎.yamato/upm-ci.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
# really work with them. Move them into the package for when we run upm-ci here.
2323
- move /Y .\Assets\Samples .\Packages\com.unity.inputsystem
2424
- move /Y .\Assets\Samples.meta .\Packages\com.unity.inputsystem
25+
- npm install upm-ci-utils@stable -g --registry https://artifactory-upload.prd.it.unity3d.com/artifactory/api/npm/upm-npm
2526
- upm-ci package pack --package-path ./Packages/com.unity.inputsystem/
2627
# Run upm-ci verification tests as well as tests contained in the package.
2728
- upm-ci package test --package-path ./Packages/com.unity.inputsystem/ -u %EDITOR_VERSION%
@@ -74,6 +75,7 @@
7475
# really work with them. Move them into the package for when we run upm-ci here.
7576
- mv ./Assets/Samples ./Packages/com.unity.inputsystem
7677
- mv ./Assets/Samples.meta ./Packages/com.unity.inputsystem
78+
- npm install upm-ci-utils@stable -g --registry https://artifactory-upload.prd.it.unity3d.com/artifactory/api/npm/upm-npm
7779
- upm-ci package pack --package-path ./Packages/com.unity.inputsystem/
7880
# Run upm-ci verification tests as well as tests contained in the package.
7981
- upm-ci package test --package-path ./Packages/com.unity.inputsystem/ -u $EDITOR_VERSION {% if category.name == "functional" and platform.name == "mac" or platform.name == "linux" %} --enable-code-coverage --code-coverage-options "generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem;pathReplacePatterns:@*,,Library/PackageCache,Packages" --extra-utr-arg="--coverage-results-path={{ yamato_source_dir_nix }}/upm-ci~/test-results/CodeCoverage/Package --coverage-upload-options=\"reportsDir:upm-ci~/test-results/CodeCoverage/Package;name:{{platform.name}}_{{editor.version}}_pkg;flags:{{platform.name}}_{{editor.version}}_pkg\"" {% endif %}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ api_validation_-_inputsystem_-_2021_3_-_windows:
1313
type: Unity::VM
1414
flavor: b1.large
1515
commands:
16-
- command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-59_594aea2e5eb3a7468ad88458b5c5da2e5e72af0d2267db7b025602fb69e57bd7.zip -o wrench-localapv.zip
16+
- command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-68_53c92d3b34ce3f4b652c9785dd1530bdc5885f6523465d6969c3be91f9ccaaf1.zip -o wrench-localapv.zip
1717
- command: 7z x -aoa wrench-localapv.zip
1818
- command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple
1919
- command: python PythonScripts/print_machine_info.py
2020
- command: npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
2121
timeout: 20
2222
retries: 10
23-
- command: unity-downloader-cli -u 2021.3 -c Editor --fast
23+
- command: unity-downloader-cli -u 2021.3/staging -c editor --path .Editor --fast
2424
timeout: 10
2525
retries: 3
2626
- command: python PythonScripts/PackageJsonCondersor.py
@@ -51,8 +51,8 @@ api_validation_-_inputsystem_-_2021_3_-_windows:
5151
dependencies:
5252
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_inputsystem
5353
variables:
54-
UPMPVP_CONTEXT_WRENCH: 0.10.43.0
54+
UPMPVP_CONTEXT_WRENCH: 0.12.2.0
5555
metadata:
5656
Job Maintainers: '#rm-packageworks'
57-
Wrench: 0.10.43.0
57+
Wrench: 0.12.2.0
5858

‎.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.43.0
29+
Wrench: 0.12.2.0
3030

0 commit comments

Comments
 (0)