Skip to content

Commit ef4310b

Browse files
benoitalainbenoitalain
committed
Merge branch 'develop' of github.com:Unity-Technologies/InputSystem into uitech/bugfix/uum-77364-inputsysteminputmodulenonkeyboardnavigation
# Conflicts: # Packages/com.unity.inputsystem/CHANGELOG.md # Packages/manifest.json
2 parents ecf41d5 + d3eae07 commit ef4310b

Some content is hidden

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

48 files changed

+775
-584
lines changed

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,3 +49,6 @@ Tools/CI/[Oo]bj
4949
.Editor
5050
.bin
5151
.download
52+
53+
!Tools/CI/InputSystem.Cookbook.csproj
54+
!Tools/CI/InputSystem-recipes.sln

‎.yamato/analyze.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ code_analyser:
1414
- unzip Tools/CodeAnalyzerTestProject/Microsoft.CodeQuality.Analyzers/Microsoft.CodeQuality.Analyzers.zip -d Tools/CodeAnalyzerTestProject/Microsoft.CodeQuality.Analyzers
1515
- {{ upm_ci_install }}
1616
- upm-ci package pack --package-path ./Packages/com.unity.inputsystem/
17-
- upm-ci project test --project-path Tools/CodeAnalyzerTestProject -u 2019.4
17+
- upm-ci project test --project-path Tools/CodeAnalyzerTestProject -u 2021.3
1818
triggers:
1919
cancel_old_ci: true
2020
pull_requests:

‎.yamato/config.metadata‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
editors:
2-
- version: 2021.3.45f
2+
- version: 2021.3
33
- version: 2022.3
44
disable_tvos_run: true
55
- version: 6000.0
66
disable_tvos_run: true
7+
- version: 6000.1
8+
disable_tvos_run: true
79
- version: trunk
810
disable_tvos_run: true
911

‎.yamato/publish-samples.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ test_sample_projects:
1010
commands:
1111
- {{ upm_ci_install }}
1212
- upm-ci package pack --package-path ./Packages/com.unity.inputsystem/
13-
- upm-ci package test --package-path ./Packages/com.unity.inputsystem/ -u 2019.4
13+
- upm-ci package test --package-path ./Packages/com.unity.inputsystem/ -u 2021.3
1414
- Editor=.Editor/Unity.app/Contents/MacOS/Unity Method=Publish sh ExternalSampleProjects/publish.sh
1515
artifacts:
1616
UTR_Output.zip:

‎.yamato/upm-ci.yml‎

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
flavor: {{ platform.flavor }}
1313
variables:
1414
EDITOR_VERSION: {{ editor.version }}
15-
commands:
15+
commands:
1616
- {{ utr_install_win }}
1717
- {{ upm_ci_install }}
1818
# Get version 2.3.0-preview of doctools package (it currently fails for 3.0.0-preview).
@@ -26,7 +26,7 @@
2626
- upm-ci package pack --package-path ./Packages/com.unity.inputsystem/
2727
# Run upm-ci verification tests as well as tests contained in the package.
2828
- upm-ci package test --package-path ./Packages/com.unity.inputsystem/ -u %EDITOR_VERSION%
29-
{% if platform.name == "win" %} --enable-code-coverage --code-coverage-options "generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem"
29+
{% if platform.name == "win" %} --enable-code-coverage --code-coverage-options "generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem;pathReplacePatterns:@*,,Library/PackageCache,Packages"
3030
--extra-utr-arg="--coverage-results-path={{ yamato_source_dir_win }}/upm-ci~/test-results/CodeCoverage/Package" {% endif %}
3131
{% if platform.installscript %}
3232
- {{ unity_downloader_install }}
@@ -38,6 +38,13 @@
3838
- move /Y .\Packages\com.unity.inputsystem\Samples.meta .\Assets
3939
# Now run our full test suite that sits in Assets/Tests by running UTR on our project.
4040
- ./utr --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 {% endif %} --api-profile=NET_4_6 {% if platform.runtime %} --platform {{ platform.runtime }} {% endif %} {% if platform.scripting-backend %} --scripting-backend {{ platform.scripting-backend }} {% endif %} --report-performance-data --performance-project-id=InputSystem {% if platform.name == "win" %}--enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem" --coverage-results-path={{ yamato_source_dir_win }}/upm-ci~/test-results/CodeCoverage/Project {% endif %}
41+
# Merge all the code coverage results into one report.
42+
{% if platform.name == "win" %}
43+
- '{{ yamato_source_dir_win }}/.Editor/Unity.exe -projectPath {{ yamato_source_dir_win }} -batchmode -debugCodeOptimization -enableCodeCoverage -coverageResultsPath {{ yamato_source_dir_win }}/upm-ci~/test-results/CodeCoverage/ -coverageOptions "generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem;sourcePaths:{{ yamato_source_dir_win }}/Packages/com.unity.inputsystem/" -quit'
44+
#delete the reports from the two runs and only keep the final merged one
45+
- rmdir /s/q "{{ yamato_source_dir_win }}/upm-ci~/test-results/CodeCoverage/Package"
46+
- rmdir /s/q "{{ yamato_source_dir_win }}/upm-ci~/test-results/CodeCoverage/Project"
47+
{% endif %}
4148
after:
4249
- {{ instabilities_install_win }}
4350
- {{ instabilities_run_win }}
@@ -70,7 +77,7 @@
7077
- mv ./Assets/Samples.meta ./Packages/com.unity.inputsystem
7178
- upm-ci package pack --package-path ./Packages/com.unity.inputsystem/
7279
# Run upm-ci verification tests as well as tests contained in the package.
73-
- upm-ci package test --package-path ./Packages/com.unity.inputsystem/ -u $EDITOR_VERSION {% if platform.name == "mac" or platform.name == "linux" %} --enable-code-coverage --code-coverage-options "generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem" --extra-utr-arg="--coverage-results-path={{ yamato_source_dir_nix }}/upm-ci~/test-results/CodeCoverage/Package" {% endif %}
80+
- upm-ci package test --package-path ./Packages/com.unity.inputsystem/ -u $EDITOR_VERSION {% if 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" {% endif %}
7481
{% if platform.installscript %}
7582
- {{ unity_downloader_install }}
7683
- {{ platform.installscript }} $EDITOR_VERSION
@@ -81,6 +88,15 @@
8188
- mv ./Packages/com.unity.inputsystem/Samples.meta ./Assets
8289
# Now run our full test suite that sits in Assets/Tests by running UTR on our project.
8390
- ./utr --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 {% endif %} --api-profile=NET_4_6 {% if platform.runtime %} --platform {{ platform.runtime }} {% endif %} {% if platform.scripting-backend %} --scripting-backend {{ platform.scripting-backend }} {% endif %} --report-performance-data --performance-project-id=InputSystem {% if 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 {% endif %}
91+
# Merge all the code coverage results into one report.
92+
{% if platform.name == "mac" %}
93+
- '{{ yamato_source_dir_nix }}/.Editor/Unity.app/Contents/MacOS/Unity -projectPath {{ yamato_source_dir_nix }} -batchmode -debugCodeOptimization -enableCodeCoverage -coverageResultsPath {{ yamato_source_dir_nix }}/upm-ci~/test-results/CodeCoverage/ -coverageOptions "generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem;sourcePaths:{{ yamato_source_dir_nix }}/Packages/com.unity.inputsystem/" -quit'
94+
{% endif %}
95+
{% if platform.name == "linux" %}
96+
- '{{ yamato_source_dir_nix }}/.Editor/Unity -projectPath {{ yamato_source_dir_nix }} -batchmode -debugCodeOptimization -enableCodeCoverage -coverageResultsPath {{ yamato_source_dir_nix }}/upm-ci~/test-results/CodeCoverage/ -coverageOptions "generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem;sourcePaths:{{ yamato_source_dir_nix }}/Packages/com.unity.inputsystem/" -quit'
97+
{% endif %}
98+
- rm -rf {{ yamato_source_dir_nix }}/upm-ci~/test-results/CodeCoverage/Package
99+
- rm -rf {{ yamato_source_dir_nix }}/upm-ci~/test-results/CodeCoverage/Project
84100
after:
85101
- {{ instabilities_install_nix }}
86102
- {{ platform.instabilities_run }}
@@ -319,7 +335,7 @@ publish{% cycle "", "_dryrun" %}:
319335
- move /Y .\Assets\Samples .\Packages\com.unity.inputsystem
320336
- move /Y .\Assets\Samples.meta .\Packages\com.unity.inputsystem
321337
- upm-ci package pack --package-path ./Packages/com.unity.inputsystem/
322-
- upm-ci package test --package-path ./Packages/com.unity.inputsystem/ -u 2019.4
338+
- upm-ci package test --package-path ./Packages/com.unity.inputsystem/ -u 2021.3
323339
- upm-ci package publish --package-path ./Packages/com.unity.inputsystem/ {% cycle "", "--dry-run" %}
324340
- upm-pvp xray --packages "upm-ci~/packages/*.tgz" --results upm-ci~/xray
325341
- upm-pvp require "supported rme" --no-report --allow-missing --results upm-ci~/xray --exemptions upm-ci~/xray/new-exemptions.json

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
# 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: https://internaldocs.unity.com/packageworks/wrench/gettingstarted/
2+
# This job is generated by the wrench recipe engine module, see find the docs here: http://Go/ii2fb
33

4-
# upm-ci validation tests for API Validation - inputsystem - 2019.4 - windows (2019.4 - Windows).
5-
api_validation_-_inputsystem_-_2019_4_-_windows:
6-
name: API Validation - inputsystem - 2019.4 - windows
4+
# upm-ci validation tests for API Validation - inputsystem - 2021.3 - windows (2021.3 - Windows).
5+
api_validation_-_inputsystem_-_2021_3_-_windows:
6+
name: API Validation - inputsystem - 2021.3 - windows
77
agent:
8-
image: package-ci/win10:default
8+
image: package-ci/win10:v4
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-48_af8ccda5754d138ef82ae29c11ddbefa5d3dff1a8f0ddf204c7de9cefa388209.zip -o wrench-localapv.zip
12+
- command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-56_236616cc910608f3016a29947795c2e53f0c0dbfa45128d551397825ed65689e.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
1616
- command: npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
1717
timeout: 20
1818
retries: 10
19-
- command: unity-downloader-cli -u 2019.4 -c Editor --fast
19+
- command: unity-downloader-cli -u 2021.3 -c Editor --fast
2020
timeout: 10
2121
retries: 3
2222
- command: python PythonScripts/PackageJsonCondersor.py
@@ -30,7 +30,7 @@ api_validation_-_inputsystem_-_2019_4_-_windows:
3030
retries: 0
3131
after:
3232
- command: cmd.exe /c "curl -s https://artifactory-slo.bf.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"
33-
- command: cmd.exe /c "run_standalone_instability_detection-latest.bat 0.5.0 || exit 0"
33+
- command: cmd.exe /c "run_standalone_instability_detection-latest.bat 0.5.1 || exit 0"
3434
timeout: 10
3535
retries: 1
3636
artifacts:
@@ -50,11 +50,11 @@ api_validation_-_inputsystem_-_2019_4_-_windows:
5050
dependencies:
5151
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_inputsystem
5252
variables:
53-
UPMPVP_CONTEXT_WRENCH: 0.10.27.0
53+
UPMPVP_CONTEXT_WRENCH: 0.10.36.0
5454
triggers:
5555
expression: push.branch match "^release/.*"
5656
cancel_old_ci: true
5757
metadata:
5858
Job Maintainers: '#rm-packageworks'
59-
Wrench: 0.10.27.0
59+
Wrench: 0.10.36.0
6060

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
# 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: https://internaldocs.unity.com/packageworks/wrench/gettingstarted/
2+
# This job is generated by the wrench recipe engine module, see find the docs here: http://Go/ii2fb
33

4-
# Pack and Sign Input System
4+
# Pack Input System
55
package_pack_-_inputsystem:
66
name: Package Pack - inputsystem
77
agent:
8-
image: package-ci/ubuntu-20.04:default
8+
image: package-ci/ubuntu-20.04:v4
99
type: Unity::VM
1010
flavor: b1.large
1111
commands:
1212
- command: npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
1313
timeout: 20
1414
retries: 10
15-
- command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-48_af8ccda5754d138ef82ae29c11ddbefa5d3dff1a8f0ddf204c7de9cefa388209.zip -o wrench-localapv.zip
15+
- command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-56_236616cc910608f3016a29947795c2e53f0c0dbfa45128d551397825ed65689e.zip -o wrench-localapv.zip
1616
- command: 7z x -aoa wrench-localapv.zip
1717
- command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple
1818
- command: python PythonScripts/print_machine_info.py
@@ -22,7 +22,7 @@ package_pack_-_inputsystem:
2222
- command: cp upm-ci~/packages/packages.json upm-ci~/packages/com.unity.inputsystem_packages.json
2323
after:
2424
- command: curl -s https://artifactory-slo.bf.unity3d.com/artifactory/automation-and-tooling/infrastructure-instability-detection/standalone/setup/run_standalone_instability_detection-latest.sh --output run_standalone_instability_detection-latest.sh --retry 5 || exit 0
25-
- command: bash ./run_standalone_instability_detection-latest.sh ubuntu 0.5.0 || exit 0
25+
- command: bash ./run_standalone_instability_detection-latest.sh ubuntu 0.5.1 || exit 0
2626
timeout: 10
2727
retries: 1
2828
artifacts:
@@ -31,8 +31,8 @@ package_pack_-_inputsystem:
3131
- upm-ci~/packages/**/*
3232
variables:
3333
UPMCI_ACK_LARGE_PACKAGE: 1
34-
UPMPVP_CONTEXT_WRENCH: 0.10.27.0
34+
UPMPVP_CONTEXT_WRENCH: 0.10.36.0
3535
metadata:
3636
Job Maintainers: '#rm-packageworks'
37-
Wrench: 0.10.27.0
37+
Wrench: 0.10.36.0
3838

0 commit comments

Comments
 (0)