Skip to content

Commit 77c89af

Browse files
ritamerklritamerkl
committed
Merge branch 'mouseevents-samles-tests' of https://github.com/Unity-Technologies/InputSystem into mouseevents-samles-tests
2 parents e4e88bb + 042bc00 commit 77c89af

File tree

102 files changed

+21952
-1680
lines changed

Some content is hidden

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

102 files changed

+21952
-1680
lines changed

‎.yamato/config.metadata‎

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

1415
utr_install_win: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output utr.bat
1516
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 +58,18 @@ platforms_nix:
5758
installscript: unity-downloader-cli -c editor -c StandaloneSupport-IL2CPP --wait --fast -u
5859
- name: linux
5960
type: Unity::VM
60-
image: package-ci/ubuntu-20.04:v4.50.0
61+
image: package-ci/ubuntu-22.04:v4
6162
flavor: b1.large
6263
instabilities_run: sh ./run_standalone_instability_detection-latest.sh ubuntu 0.5.1 || exit 0
6364
- name: linux_standalone
6465
type: Unity::VM
65-
image: package-ci/ubuntu-20.04:v4.50.0
66+
image: package-ci/ubuntu-22.04:v4
6667
flavor: b1.large
6768
instabilities_run: sh ./run_standalone_instability_detection-latest.sh ubuntu 0.5.1 || exit 0
6869
runtime: StandaloneLinux64
6970
- name: linux_standalone_il2cpp
7071
type: Unity::VM
71-
image: package-ci/ubuntu-20.04:v4.50.0
72+
image: package-ci/ubuntu-22.04:v4
7273
flavor: b1.large
7374
instabilities_run: sh ./run_standalone_instability_detection-latest.sh ubuntu 0.5.1 || exit 0
7475
runtime: StandaloneLinux64
@@ -78,7 +79,7 @@ scripting_backends:
7879
- name: mono
7980
- name: il2cpp
8081

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

8384
test_category:
8485
- name: performance

‎.yamato/sonarqube.yml‎

Lines changed: 0 additions & 38 deletions
This file was deleted.

‎.yamato/upm-ci.yml‎

Lines changed: 17 additions & 8 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%
@@ -34,7 +35,7 @@
3435
- move /Y .\Packages\com.unity.inputsystem\Samples .\Assets
3536
- move /Y .\Packages\com.unity.inputsystem\Samples.meta .\Assets
3637
# Now run our full test suite that sits in Assets/Tests by running UTR on our project.
37-
- UnifiedTestRunner --testproject . --timeout=1200 --editor-location=.Editor --artifacts_path=upm-ci~/test-results/isolation-com.unity.inputsystem.tests --suite=playmode {% if platform.name == "win" %} --suite=editor {% endif %} {% if category.name == "performance" %} --category=Performance {% else %} --category=!Performance {% endif %} --api-profile=NET_4_6 {% if platform.runtime %} --platform {{ platform.runtime }} {% endif %} {% if platform.scripting-backend %} --scripting-backend {{ platform.scripting-backend }} {% endif %} {% if category.name == "performance" %} --report-performance-data --performance-project-id=InputSystem {% endif %} {% if platform.name == "win" and category.name == "functional" %}--enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem" --coverage-results-path={{ yamato_source_dir_win }}/upm-ci~/test-results/CodeCoverage/Project --coverage-upload-options="reportsDir:upm-ci~/test-results/CodeCoverage/Project;name:{{platform.name}}_{{editor.version}}_project;flags:{{platform.name}}_{{editor.version}}_project" {% endif %}
38+
- UnifiedTestRunner --testproject . --timeout=1200 --editor-location=.Editor --artifacts_path=upm-ci~/test-results/isolation-com.unity.inputsystem.tests --clean-library --reruncount=1 --clean-library-on-rerun --suite=playmode {% if platform.name == "win" %} --suite=editor {% endif %} {% if category.name == "performance" %} --category=Performance {% else %} --category=!Performance {% endif %} --api-profile=NET_4_6 {% if platform.runtime %} --platform {{ platform.runtime }} {% endif %} {% if platform.scripting-backend %} --scripting-backend {{ platform.scripting-backend }} {% endif %} {% if category.name == "performance" %} --report-performance-data --performance-project-id=InputSystem {% endif %} {% if platform.name == "win" and category.name == "functional" %}--enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem" --coverage-results-path={{ yamato_source_dir_win }}/upm-ci~/test-results/CodeCoverage/Project --coverage-upload-options="reportsDir:upm-ci~/test-results/CodeCoverage/Project;name:{{platform.name}}_{{editor.version}}_project;flags:{{platform.name}}_{{editor.version}}_project" {% endif %}
3839
{% if platform.name == "win" and category.name == "functional" %}
3940
# Delete the Package and Project reports & raw coverage data, to keep Artifacts.zip smaller
4041
- rmdir /s/q "{{ yamato_source_dir_win }}/upm-ci~/test-results/CodeCoverage/Package"
@@ -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 %}
@@ -85,7 +87,7 @@
8587
- mv ./Packages/com.unity.inputsystem/Samples ./Assets
8688
- mv ./Packages/com.unity.inputsystem/Samples.meta ./Assets
8789
# Now run our full test suite that sits in Assets/Tests by running UTR on our project.
88-
- UnifiedTestRunner --testproject . --timeout=1200 --editor-location=.Editor --artifacts_path=upm-ci~/test-results/isolation-com.unity.inputsystem.tests --suite=playmode {% if platform.name == "mac" or platform.name == "linux"%} --suite=editor {% endif %} {% if category.name == "performance" %} --category=Performance {% else %} --category=!Performance {% endif %} --api-profile=NET_4_6 {% if platform.runtime %} --platform {{ platform.runtime }} {% endif %} {% if platform.scripting-backend %} --scripting-backend {{ platform.scripting-backend }} {% endif %} {% if category.name == "performance" %} --report-performance-data --performance-project-id=InputSystem {% endif %} {% if category.name == "functional" and platform.name == "mac" or platform.name == "linux" %} --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem" --coverage-results-path={{ yamato_source_dir_nix }}/upm-ci~/test-results/CodeCoverage/Project --coverage-upload-options="reportsDir:upm-ci~/test-results/CodeCoverage/Project;name:{{platform.name}}_{{editor.version}}_project;flags:{{platform.name}}_{{editor.version}}_project" {% endif %}
90+
- UnifiedTestRunner --testproject . --timeout=1200 --editor-location=.Editor --artifacts_path=upm-ci~/test-results/isolation-com.unity.inputsystem.tests --clean-library --reruncount=1 --clean-library-on-rerun --suite=playmode {% if platform.name == "mac" or platform.name == "linux"%} --suite=editor {% endif %} {% if category.name == "performance" %} --category=Performance {% else %} --category=!Performance {% endif %} --api-profile=NET_4_6 {% if platform.runtime %} --platform {{ platform.runtime }} {% endif %} {% if platform.scripting-backend %} --scripting-backend {{ platform.scripting-backend }} {% endif %} {% if category.name == "performance" %} --report-performance-data --performance-project-id=InputSystem {% endif %} {% if category.name == "functional" and platform.name == "mac" or platform.name == "linux" %} --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem" --coverage-results-path={{ yamato_source_dir_nix }}/upm-ci~/test-results/CodeCoverage/Project --coverage-upload-options="reportsDir:upm-ci~/test-results/CodeCoverage/Project;name:{{platform.name}}_{{editor.version}}_project;flags:{{platform.name}}_{{editor.version}}_project" {% endif %}
8991
{% if category.name == "functional" and platform.name == "mac" or platform.name == "linux"%}
9092
# Delete the Package and Project reports & raw coverage data, to keep Artifacts.zip smaller
9193
- rm -rf {{ yamato_source_dir_nix }}/upm-ci~/test-results/CodeCoverage/Package
@@ -118,9 +120,12 @@ build_ios_{{ editor.version }}_{{ category.name }}:
118120
variables:
119121
EDITOR_VERSION: {{ editor.version }}
120122
UTR_VERSION: 1.35.1
123+
{% if editor.run_ios_15 %}
124+
UNITY_HANDLEUIINTERRUPTIONS: 1
125+
{% endif %}
121126
commands:
122127
- unity-downloader-cli -c Editor -c iOS -u $EDITOR_VERSION --fast --wait
123-
- UnifiedTestRunner --suite=playmode {% if category.name == "performance" %} --category=Performance {% else %} --category=!Performance {% endif %} --platform=iOS --editor-location=.Editor --testproject=. --player-save-path=build/players --artifacts_path=build/logs --build-only {% if category.name == "performance" %} --report-performance-data --performance-project-id=InputSystem {% endif %}
128+
- UnifiedTestRunner --suite=playmode --clean-library --reruncount=1 --clean-library-on-rerun {% if category.name == "performance" %} --category=Performance {% else %} --category=!Performance {% endif %} --platform=iOS --editor-location=.Editor --testproject=. --player-save-path=build/players --artifacts_path=build/logs --build-only {% if category.name == "performance" %} --report-performance-data --performance-project-id=InputSystem {% endif %}
124129
after:
125130
- {{ instabilities_install_nix }}
126131
- {{ instabilities_run_mac }}
@@ -137,7 +142,11 @@ run_ios_{{ editor.version }}_{{ category.name }}:
137142
agent:
138143
type: Unity::mobile::iPhone
139144
image: {{ ios_and_tvos_macos_bokken_image }}
145+
{% if editor.run_ios_15 %}
146+
model: SE-Gen3
147+
{% else %}
140148
model: SE
149+
{% endif %}
141150
flavor: b1.medium
142151
variables:
143152
EDITOR_VERSION: {{ editor.version }}
@@ -147,7 +156,7 @@ run_ios_{{ editor.version }}_{{ category.name }}:
147156
dependencies:
148157
- .yamato/upm-ci.yml#build_ios_{{ editor.version }}_{{ category.name }}
149158
commands:
150-
- UnifiedTestRunner --suite=playmode {% if category.name == "performance" %} --category=Performance {% else %} --category=!Performance {% endif %} --platform=iOS --player-load-path=build/players --artifacts_path=build/test-results {% if category.name == "performance" %} --report-performance-data --performance-project-id=InputSystem {% endif %}
159+
- UnifiedTestRunner --suite=playmode --clean-library --reruncount=1 --clean-library-on-rerun {% if category.name == "performance" %} --category=Performance {% else %} --category=!Performance {% endif %} --platform=iOS --player-load-path=build/players --artifacts_path=build/test-results {% if category.name == "performance" %} --report-performance-data --performance-project-id=InputSystem {% endif %}
151160
after:
152161
- {{ instabilities_install_nix }}
153162
- {{ instabilities_run_mac }}
@@ -167,7 +176,7 @@ build_tvos_{{ editor.version }}_{{ category.name }}:
167176
UTR_VERSION: 1.35.1
168177
commands:
169178
- unity-downloader-cli -c Editor -c AppleTV -u $EDITOR_VERSION --fast --wait
170-
- UnifiedTestRunner --suite=playmode {% if category.name == "performance" %} --category=Performance {% else %} --category=!Performance {% endif %} --platform=tvOS --editor-location=.Editor --testproject=. --player-save-path=build/players --artifacts_path=build/logs --build-only {% if category.name == "performance" %} --report-performance-data --performance-project-id=InputSystem {% endif %}
179+
- UnifiedTestRunner --suite=playmode --clean-library --reruncount=1 --clean-library-on-rerun {% if category.name == "performance" %} --category=Performance {% else %} --category=!Performance {% endif %} --platform=tvOS --editor-location=.Editor --testproject=. --player-save-path=build/players --artifacts_path=build/logs --build-only {% if category.name == "performance" %} --report-performance-data --performance-project-id=InputSystem {% endif %}
171180
after:
172181
- {{ instabilities_install_nix }}
173182
- {{ instabilities_run_mac }}
@@ -193,7 +202,7 @@ run_tvos_{{ editor.version }}_{{ category.name }}:
193202
dependencies:
194203
- .yamato/upm-ci.yml#build_tvos_{{ editor.version }}_{{ category.name }}
195204
commands:
196-
- UnifiedTestRunner --suite=playmode {% if category.name == "performance" %} --category=Performance {% else %} --category=!Performance {% endif %} --platform=tvOS --player-load-path=build/players --artifacts_path=build/test-results {% if category.name == "performance" %} --report-performance-data --performance-project-id=InputSystem {% endif %}
205+
- UnifiedTestRunner --suite=playmode --clean-library --reruncount=1 --clean-library-on-rerun {% if category.name == "performance" %} --category=Performance {% else %} --category=!Performance {% endif %} --platform=tvOS --player-load-path=build/players --artifacts_path=build/test-results {% if category.name == "performance" %} --report-performance-data --performance-project-id=InputSystem {% endif %}
197206
after:
198207
- {{ instabilities_install_nix }}
199208
- {{ instabilities_run_mac }}
@@ -215,7 +224,7 @@ build_android_{{ editor.version }}_{{ backend.name }}_{{ category.name }}:
215224
EDITOR_VERSION: {{ editor.version }}
216225
commands:
217226
- unity-downloader-cli -c Editor -c Android -u %EDITOR_VERSION% --fast --wait
218-
- UnifiedTestRunner --suite=playmode {% if category.name == "performance" %} --category=Performance {% else %} --category=!Performance {% endif %} --platform=Android --editor-location=.Editor --testproject=. --player-save-path=build/players --artifacts_path=build/logs --scripting-backend={{ backend.name }} --build-only --repository {% if category.name == "performance" %} --performance-project-id=InputSystem {% endif %}
227+
- UnifiedTestRunner --suite=playmode --clean-library --reruncount=1 --clean-library-on-rerun {% if category.name == "performance" %} --category=Performance {% else %} --category=!Performance {% endif %} --platform=Android --editor-location=.Editor --testproject=. --player-save-path=build/players --artifacts_path=build/logs --scripting-backend={{ backend.name }} --build-only --repository {% if category.name == "performance" %} --performance-project-id=InputSystem {% endif %}
219228
after:
220229
- {{ instabilities_install_win }}
221230
- {{ instabilities_run_win }}
@@ -248,7 +257,7 @@ run_android_{{ editor.version }}_{{ backend.name }}_{{ category.name }}:
248257
start %ANDROID_SDK_ROOT%\platform-tools\adb.exe connect %BOKKEN_DEVICE_IP%
249258
# List the connected devices
250259
start %ANDROID_SDK_ROOT%\platform-tools\adb.exe devices
251-
UnifiedTestRunner --suite=playmode {% if category.name == "performance" %} --category=Performance {% else %} --category=!Performance {% endif %} --platform=android --player-load-path=build/players --artifacts_path=build/test-results {% if category.name == "performance" %} --report-performance-data --performance-project-id=InputSystem {% endif %}
260+
UnifiedTestRunner --suite=playmode --clean-library --reruncount=1 --clean-library-on-rerun {% if category.name == "performance" %} --category=Performance {% else %} --category=!Performance {% endif %} --platform=android --player-load-path=build/players --artifacts_path=build/test-results {% if category.name == "performance" %} --report-performance-data --performance-project-id=InputSystem {% endif %}
252261
after:
253262
- start %ANDROID_SDK_ROOT%\platform-tools\adb.exe connect %BOKKEN_DEVICE_IP%
254263
- if not exist build\test-results mkdir build\test-results

0 commit comments

Comments
 (0)