Skip to content

Commit faee8b2

Browse files
ekcohekcoh
authored
Merge branch 'develop' into ekcoh/profiler
2 parents 4046fad + 6b042c2 commit faee8b2

File tree

111 files changed

+13402
-1406
lines changed

Some content is hidden

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

111 files changed

+13402
-1406
lines changed

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,9 @@ Packages/com.unity.inputsystem/**/*.api.meta
4343
Packages/com.unity.package-manager-ui/
4444
Packages/com.unity.package-manager-doctools/
4545

46+
Tools/CI/[Bb]in
47+
Tools/CI/[Oo]bj
48+
4649
.Editor
4750
.bin
4851
.download

‎.yamato/config.metadata‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,35 +17,35 @@ upm_ci_install: npm install -g upm-ci-utils@stable --registry https://artifactor
1717
platforms_win:
1818
- name: win
1919
type: Unity::VM
20-
image: package-ci/win10:default
20+
image: package-ci/win10:v4
2121
flavor: b1.large
2222
- name: win_standalone
2323
type: Unity::VM
24-
image: package-ci/win10:default
24+
image: package-ci/win10:v4
2525
flavor: b1.large
2626
runtime: StandaloneWindows64
2727
- name: win_standalone_il2cpp
2828
type: Unity::VM
29-
image: package-ci/win10:default
29+
image: package-ci/win10:v4
3030
flavor: b1.large
3131
runtime: StandaloneWindows64
3232
scripting-backend: Il2Cpp
3333
installscript: unity-downloader-cli -c editor -c StandaloneSupport-IL2CPP --wait --fast -u
3434
platforms_nix:
3535
- name: mac
3636
type: Unity::VM::osx
37-
image: package-ci/macos-13:default
37+
image: package-ci/macos-13:v4
3838
flavor: m1.mac
3939
instabilities_run: sh ./run_standalone_instability_detection-latest.sh macos 0.5.1 || exit 0
4040
- name: mac_standalone
4141
type: Unity::VM::osx
42-
image: package-ci/macos-13:default
42+
image: package-ci/macos-13:v4
4343
flavor: m1.mac
4444
instabilities_run: sh ./run_standalone_instability_detection-latest.sh macos 0.5.1 || exit 0
4545
runtime: StandaloneOSX
4646
- name: mac_standalone_il2cpp
4747
type: Unity::VM::osx
48-
image: package-ci/macos-13:default
48+
image: package-ci/macos-13:v4
4949
flavor: m1.mac
5050
instabilities_run: sh ./run_standalone_instability_detection-latest.sh macos 0.5.1 || exit 0
5151
runtime: StandaloneOSX
@@ -84,4 +84,7 @@ instabilities_install_win: curl -s https://artifactory.prd.it.unity3d.com/artifa
8484
instabilities_run_win: run_standalone_instability_detection-latest.bat 0.5.1 || exit 0
8585

8686
instabilities_install_nix: curl -s https://artifactory.prd.it.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
87-
instabilities_run_mac: sh ./run_standalone_instability_detection-latest.sh macos 0.5.1 || exit 0
87+
instabilities_run_mac: sh ./run_standalone_instability_detection-latest.sh macos 0.5.1 || exit 0
88+
89+
yamato_source_dir_win: "%YAMATO_SOURCE_DIR%"
90+
yamato_source_dir_nix: ${YAMATO_SOURCE_DIR}

‎.yamato/promotion.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ promote:
88
image: package-ci/win10:default
99
flavor: b1.large
1010
dependencies:
11-
- .yamato/publish-samples.yml
11+
- .yamato/publish-samples.yml#test_sample_projects
1212
variables:
1313
UPMCI_PROMOTION: 1
1414
commands:

‎.yamato/upm-ci.yml‎

Lines changed: 28 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
type: {{ platform.type }}
1111
image: {{ platform.image }}
1212
flavor: {{ platform.flavor }}
13+
variables:
14+
EDITOR_VERSION: {{ editor.version }}
1315
commands:
1416
- {{ utr_install_win }}
1517
- {{ upm_ci_install }}
@@ -23,17 +25,19 @@
2325
- move /Y .\Assets\Samples.meta .\Packages\com.unity.inputsystem
2426
- upm-ci package pack --package-path ./Packages/com.unity.inputsystem/
2527
# Run upm-ci verification tests as well as tests contained in the package.
26-
- upm-ci package test --package-path ./Packages/com.unity.inputsystem/ -u {{ editor.version }}
28+
- 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"
30+
--extra-utr-arg="--coverage-results-path={{ yamato_source_dir_win }}/upm-ci~/test-results/CodeCoverage/Package" {% endif %}
2731
{% if platform.installscript %}
2832
- {{ unity_downloader_install }}
29-
- {{ platform.installscript }} {{ editor.version }}
33+
- {{ platform.installscript }} %EDITOR_VERSION%
3034
{% endif %}
3135
# ADBv2 on 2019.4 causes the test runner to not start on initial import when the
3236
# samples are in the package. Move the samples back into the project.
3337
- move /Y .\Packages\com.unity.inputsystem\Samples .\Assets
3438
- move /Y .\Packages\com.unity.inputsystem\Samples.meta .\Assets
3539
# Now run our full test suite that sits in Assets/Tests by running UTR on our project.
36-
- ./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
40+
- ./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 %}
3741
after:
3842
- {{ instabilities_install_win }}
3943
- {{ instabilities_run_win }}
@@ -52,6 +56,8 @@
5256
type: {{ platform.type }}
5357
image: {{ platform.image }}
5458
flavor: {{ platform.flavor }}
59+
variables:
60+
EDITOR_VERSION: {{ editor.version }}
5561
commands:
5662
- {{ utr_install_nix }}
5763
- {{ upm_ci_install }}
@@ -64,17 +70,17 @@
6470
- mv ./Assets/Samples.meta ./Packages/com.unity.inputsystem
6571
- upm-ci package pack --package-path ./Packages/com.unity.inputsystem/
6672
# Run upm-ci verification tests as well as tests contained in the package.
67-
- upm-ci package test --package-path ./Packages/com.unity.inputsystem/ -u {{ editor.version }}
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 %}
6874
{% if platform.installscript %}
6975
- {{ unity_downloader_install }}
70-
- {{ platform.installscript }} {{ editor.version }}
76+
- {{ platform.installscript }} $EDITOR_VERSION
7177
{% endif %}
7278
# ADBv2 on 2019.4 causes the test runner to not start on initial import when the
7379
# samples are in the package. Move the samples back into the project.
7480
- mv ./Packages/com.unity.inputsystem/Samples ./Assets
7581
- mv ./Packages/com.unity.inputsystem/Samples.meta ./Assets
7682
# Now run our full test suite that sits in Assets/Tests by running UTR on our project.
77-
- ./utr --testproject . --timeout=1200 --editor-location=.Editor --artifacts_path=upm-ci~/test-results/isolation-com.unity.inputsystem.tests --suite=playmode {% if platform.name == "mac" %} --suite=editor {% endif %} {% if 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
83+
- ./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 %}
7884
after:
7985
- {{ instabilities_install_nix }}
8086
- {{ platform.instabilities_run }}
@@ -94,10 +100,12 @@ build_ios_{{ editor.version }}_{{ category.name }}:
94100
type: Unity::VM::osx
95101
image: {{ ios_and_tvos_macos_bokken_image }}
96102
flavor: b1.large
103+
variables:
104+
EDITOR_VERSION: {{ editor.version }}
97105
commands:
98106
- {{ utr_install_nix }}
99107
- {{ unity_downloader_install }}
100-
- unity-downloader-cli -c Editor -c iOS -u {{ editor.version }} --fast --wait
108+
- unity-downloader-cli -c Editor -c iOS -u $EDITOR_VERSION --fast --wait
101109
- ./utr --suite=playmode {% if category.name == "performance" %} --category=Performance {% endif %} --platform=iOS --editor-location=.Editor --testproject=. --player-save-path=build/players --artifacts_path=build/logs --build-only --report-performance-data --performance-project-id=InputSystem
102110
after:
103111
- {{ instabilities_install_nix }}
@@ -117,6 +125,8 @@ run_ios_{{ editor.version }}_{{ category.name }}:
117125
image: {{ ios_and_tvos_macos_bokken_image }}
118126
model: SE
119127
flavor: b1.medium
128+
variables:
129+
EDITOR_VERSION: {{ editor.version }}
120130
skip_checkout: true
121131
dependencies:
122132
- .yamato/upm-ci.yml#build_ios_{{ editor.version }}_{{ category.name }}
@@ -138,10 +148,12 @@ build_tvos_{{ editor.version }}:
138148
type: Unity::VM::osx
139149
image: {{ ios_and_tvos_macos_bokken_image }}
140150
flavor: b1.large
151+
variables:
152+
EDITOR_VERSION: {{ editor.version }}
141153
commands:
142154
- {{ utr_install_nix }}
143155
- {{ unity_downloader_install }}
144-
- unity-downloader-cli -c Editor -c AppleTV -u {{ editor.version }} --fast --wait
156+
- unity-downloader-cli -c Editor -c AppleTV -u $EDITOR_VERSION --fast --wait
145157
- ./utr --suite=playmode --platform=tvOS --editor-location=.Editor --testproject=. --player-save-path=build/players --artifacts_path=build/logs --build-only --report-performance-data --performance-project-id=InputSystem
146158
after:
147159
- {{ instabilities_install_nix }}
@@ -160,6 +172,8 @@ run_tvos_{{ editor.version }}:
160172
type: Unity::mobile::appletv
161173
image: {{ ios_and_tvos_macos_bokken_image }}
162174
flavor: b1.medium
175+
variables:
176+
EDITOR_VERSION: {{ editor.version }}
163177
skip_checkout: true
164178
dependencies:
165179
- .yamato/upm-ci.yml#build_tvos_{{ editor.version }}
@@ -182,10 +196,12 @@ build_android_{{ editor.version }}_{{ backend.name }}_{{ category.name }}:
182196
type: Unity::VM
183197
image: package-ci/win10:default
184198
flavor: b1.xlarge
199+
variables:
200+
EDITOR_VERSION: {{ editor.version }}
185201
commands:
186202
- {{ utr_install_win }}
187203
- {{ unity_downloader_install }}
188-
- unity-downloader-cli -c Editor -c Android -u {{ editor.version }} --fast --wait
204+
- unity-downloader-cli -c Editor -c Android -u %EDITOR_VERSION% --fast --wait
189205
- ./utr --suite=playmode {% if category.name == "performance" %} --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 --performance-project-id=InputSystem
190206
after:
191207
- {{ instabilities_install_win }}
@@ -204,6 +220,8 @@ run_android_{{ editor.version }}_{{ backend.name }}_{{ category.name }}:
204220
type: Unity::mobile::shield
205221
image: package-ci/win10:default
206222
flavor: b1.medium
223+
variables:
224+
EDITOR_VERSION: {{ editor.version }}
207225
# Skip repository cloning
208226
skip_checkout: true
209227
# Set a dependency on the build job
@@ -235,7 +253,7 @@ run_android_{{ editor.version }}_{{ backend.name }}_{{ category.name }}:
235253
{% endfor %} # editors
236254

237255
all_tests:
238-
name: All Tests
256+
name: All Tests
239257
dependencies:
240258
{% for editor in editors %}
241259
{% for platform in platforms_win %}

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

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
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: https://internaldocs.unity.com/packageworks/wrench/gettingstarted/
3+
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
7+
agent:
8+
image: package-ci/win10:default
9+
type: Unity::VM
10+
flavor: b1.large
11+
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
13+
- command: 7z x -aoa wrench-localapv.zip
14+
- command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple
15+
- command: python PythonScripts/print_machine_info.py
16+
- command: npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
17+
timeout: 20
18+
retries: 10
19+
- command: unity-downloader-cli -u 2019.4 -c Editor --fast
20+
timeout: 10
21+
retries: 3
22+
- command: python PythonScripts/PackageJsonCondersor.py
23+
timeout: 1
24+
retries: 0
25+
- command: upm-ci package test -u .Editor --package-path Packages/com.unity.inputsystem --type vetting-tests || exit 0
26+
timeout: 30
27+
retries: 0
28+
- command: python PythonScripts/parse_upm_ci_results.py --package-path=Packages/com.unity.inputsystem
29+
timeout: 2
30+
retries: 0
31+
after:
32+
- 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"
34+
timeout: 10
35+
retries: 1
36+
artifacts:
37+
Crash Dumps:
38+
paths:
39+
- CrashDumps/**
40+
logs:
41+
paths:
42+
- '*.log'
43+
- '*.xml'
44+
- upm-ci~/test-results/**/*
45+
- upm-ci~/temp/*/Logs/**
46+
- upm-ci~/temp/*/Library/*.log
47+
- upm-ci~/temp/*/*.log
48+
- upm-ci~/temp/Builds/*.log
49+
browsable: onNonSuccess
50+
dependencies:
51+
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_inputsystem
52+
variables:
53+
UPMPVP_CONTEXT_WRENCH: 0.10.27.0
54+
triggers:
55+
expression: push.branch match "^release/.*"
56+
cancel_old_ci: true
57+
metadata:
58+
Job Maintainers: '#rm-packageworks'
59+
Wrench: 0.10.27.0
60+

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

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
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: https://internaldocs.unity.com/packageworks/wrench/gettingstarted/
3+
4+
# Pack and Sign Input System
5+
package_pack_-_inputsystem:
6+
name: Package Pack - inputsystem
7+
agent:
8+
image: package-ci/ubuntu-20.04:default
9+
type: Unity::VM
10+
flavor: b1.large
11+
commands:
12+
- command: npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
13+
timeout: 20
14+
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
16+
- command: 7z x -aoa wrench-localapv.zip
17+
- command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple
18+
- command: python PythonScripts/print_machine_info.py
19+
- command: mv ./Assets/Samples ./Packages/com.unity.inputsystem
20+
- command: mv ./Assets/Samples.meta ./Packages/com.unity.inputsystem
21+
- command: upm-ci package pack --package-path Packages/com.unity.inputsystem
22+
- command: cp upm-ci~/packages/packages.json upm-ci~/packages/com.unity.inputsystem_packages.json
23+
after:
24+
- 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
26+
timeout: 10
27+
retries: 1
28+
artifacts:
29+
packages:
30+
paths:
31+
- upm-ci~/packages/**/*
32+
variables:
33+
UPMCI_ACK_LARGE_PACKAGE: 1
34+
UPMPVP_CONTEXT_WRENCH: 0.10.27.0
35+
metadata:
36+
Job Maintainers: '#rm-packageworks'
37+
Wrench: 0.10.27.0
38+

0 commit comments

Comments
 (0)