Skip to content

Commit 1377db4

Browse files
josepmariapujol-unityjosepmariapujol-unity
committed
Merge branch 'develop' into joao/editor-runtime-split-for-module
2 parents 269222e + 68d9a53 commit 1377db4

33 files changed

+1596
-175
lines changed

‎.yamato/input-system-editor-functional-tests.yml‎

Lines changed: 58 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ inputsystem-editorfunctionaltests_-_6000_5_-_macos:
229229
flavor: b1.xlarge
230230
commands:
231231
- command: git clone --branch "2.3.0-preview" git@github.cds.internal.unity3d.com:unity/com.unity.package-manager-doctools.git Packages/com.unity.package-manager-doctools
232-
- command: unity-downloader-cli -u trunk -c Editor --fast --wait
232+
- command: unity-downloader-cli -u 6000.5/staging -c Editor --fast --wait
233233
- command: UnifiedTestRunner --testproject=. --editor-location=.Editor --suite=Editor --suite=Playmode --category=!Performance --clean-library --api-profile=NET_4_6 --reruncount=1 --clean-library-on-rerun --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem*;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:$YAMATO_SOURCE_DIR/Packages;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:inputsystem_MacOS_6000.5_project;flags:inputsystem_MacOS_6000.5_project" --timeout=3600 --artifacts-path=artifacts
234234
after:
235235
- command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh
@@ -247,7 +247,7 @@ inputsystem-editorfunctionaltests_-_6000_5_-_ubuntu:
247247
flavor: b1.large
248248
commands:
249249
- command: git clone --branch "2.3.0-preview" git@github.cds.internal.unity3d.com:unity/com.unity.package-manager-doctools.git Packages/com.unity.package-manager-doctools
250-
- command: unity-downloader-cli -u trunk -c Editor --fast --wait
250+
- command: unity-downloader-cli -u 6000.5/staging -c Editor --fast --wait
251251
- command: UnifiedTestRunner --testproject=. --editor-location=.Editor --suite=Editor --suite=Playmode --category=!Performance --clean-library --api-profile=NET_4_6 --reruncount=1 --clean-library-on-rerun --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem*;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:$YAMATO_SOURCE_DIR/Packages;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:inputsystem_Ubuntu_6000.5_project;flags:inputsystem_Ubuntu_6000.5_project" --timeout=3600 --artifacts-path=artifacts
252252
after:
253253
- command: bash .yamato/generated-scripts/infrastructure-instability-detection-linux.sh
@@ -266,7 +266,7 @@ inputsystem-editorfunctionaltests_-_6000_5_-_windows:
266266
commands:
267267
- command: '%GSUDO% choco install netfx-4.7.1-devpack -y --ignore-detected-reboot --ignore-package-codes'
268268
- command: git clone --branch "2.3.0-preview" git@github.cds.internal.unity3d.com:unity/com.unity.package-manager-doctools.git Packages/com.unity.package-manager-doctools
269-
- command: unity-downloader-cli -u trunk -c Editor --fast --wait
269+
- command: unity-downloader-cli -u 6000.5/staging -c Editor --fast --wait
270270
- command: UnifiedTestRunner.exe --testproject=. --editor-location=.Editor --suite=Editor --suite=Playmode --category=!Performance --clean-library --api-profile=NET_4_6 --reruncount=1 --clean-library-on-rerun --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem*;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:%YAMATO_SOURCE_DIR%/Packages;" --coverage-results-path=%YAMATO_SOURCE_DIR%/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:inputsystem_Windows_6000.5_project;flags:inputsystem_Windows_6000.5_project" --timeout=3600 --artifacts-path=artifacts
271271
after:
272272
- command: .yamato\generated-scripts\infrastructure-instability-detection-win.cmd
@@ -275,3 +275,58 @@ inputsystem-editorfunctionaltests_-_6000_5_-_windows:
275275
paths:
276276
- artifacts/**/*
277277

278+
# InputSystem-EditorFunctionalTests - 6000.6 - MacOS
279+
inputsystem-editorfunctionaltests_-_6000_6_-_macos:
280+
name: InputSystem-EditorFunctionalTests - 6000.6 - MacOS
281+
agent:
282+
image: package-ci/macos-13:default
283+
type: Unity::VM::osx
284+
flavor: b1.xlarge
285+
commands:
286+
- command: git clone --branch "2.3.0-preview" git@github.cds.internal.unity3d.com:unity/com.unity.package-manager-doctools.git Packages/com.unity.package-manager-doctools
287+
- command: unity-downloader-cli -u trunk -c Editor --fast --wait
288+
- command: UnifiedTestRunner --testproject=. --editor-location=.Editor --suite=Editor --suite=Playmode --category=!Performance --clean-library --api-profile=NET_4_6 --reruncount=1 --clean-library-on-rerun --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem*;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:$YAMATO_SOURCE_DIR/Packages;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:inputsystem_MacOS_6000.6_project;flags:inputsystem_MacOS_6000.6_project" --timeout=3600 --artifacts-path=artifacts
289+
after:
290+
- command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh
291+
artifacts:
292+
artifacts:
293+
paths:
294+
- artifacts/**/*
295+
296+
# InputSystem-EditorFunctionalTests - 6000.6 - Ubuntu
297+
inputsystem-editorfunctionaltests_-_6000_6_-_ubuntu:
298+
name: InputSystem-EditorFunctionalTests - 6000.6 - Ubuntu
299+
agent:
300+
image: package-ci/ubuntu-22.04:default
301+
type: Unity::VM
302+
flavor: b1.large
303+
commands:
304+
- command: git clone --branch "2.3.0-preview" git@github.cds.internal.unity3d.com:unity/com.unity.package-manager-doctools.git Packages/com.unity.package-manager-doctools
305+
- command: unity-downloader-cli -u trunk -c Editor --fast --wait
306+
- command: UnifiedTestRunner --testproject=. --editor-location=.Editor --suite=Editor --suite=Playmode --category=!Performance --clean-library --api-profile=NET_4_6 --reruncount=1 --clean-library-on-rerun --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem*;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:$YAMATO_SOURCE_DIR/Packages;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:inputsystem_Ubuntu_6000.6_project;flags:inputsystem_Ubuntu_6000.6_project" --timeout=3600 --artifacts-path=artifacts
307+
after:
308+
- command: bash .yamato/generated-scripts/infrastructure-instability-detection-linux.sh
309+
artifacts:
310+
artifacts:
311+
paths:
312+
- artifacts/**/*
313+
314+
# InputSystem-EditorFunctionalTests - 6000.6 - Windows
315+
inputsystem-editorfunctionaltests_-_6000_6_-_windows:
316+
name: InputSystem-EditorFunctionalTests - 6000.6 - Windows
317+
agent:
318+
image: package-ci/win10:default
319+
type: Unity::VM
320+
flavor: b1.large
321+
commands:
322+
- command: '%GSUDO% choco install netfx-4.7.1-devpack -y --ignore-detected-reboot --ignore-package-codes'
323+
- command: git clone --branch "2.3.0-preview" git@github.cds.internal.unity3d.com:unity/com.unity.package-manager-doctools.git Packages/com.unity.package-manager-doctools
324+
- command: unity-downloader-cli -u trunk -c Editor --fast --wait
325+
- command: UnifiedTestRunner.exe --testproject=. --editor-location=.Editor --suite=Editor --suite=Playmode --category=!Performance --clean-library --api-profile=NET_4_6 --reruncount=1 --clean-library-on-rerun --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem*;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:%YAMATO_SOURCE_DIR%/Packages;" --coverage-results-path=%YAMATO_SOURCE_DIR%/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:inputsystem_Windows_6000.6_project;flags:inputsystem_Windows_6000.6_project" --timeout=3600 --artifacts-path=artifacts
326+
after:
327+
- command: .yamato\generated-scripts\infrastructure-instability-detection-win.cmd
328+
artifacts:
329+
artifacts:
330+
paths:
331+
- artifacts/**/*
332+

‎.yamato/input-system-editor-performance-tests.yml‎

Lines changed: 57 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ inputsystem-editorperformancetests_-_6000_5_-_macos:
229229
flavor: b1.xlarge
230230
commands:
231231
- command: git clone --branch "2.3.0-preview" git@github.cds.internal.unity3d.com:unity/com.unity.package-manager-doctools.git Packages/com.unity.package-manager-doctools
232-
- command: unity-downloader-cli -u trunk -c Editor --fast --wait
232+
- command: unity-downloader-cli -u 6000.5/staging -c Editor --fast --wait
233233
- command: UnifiedTestRunner --testproject=. --editor-location=.Editor --suite=Editor --suite=Playmode --category=Performance --clean-library --api-profile=NET_4_6 --reruncount=1 --clean-library-on-rerun --report-performance-data --performance-project-id=InputSystem --timeout=3600 --artifacts-path=artifacts
234234
after:
235235
- command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh
@@ -247,7 +247,7 @@ inputsystem-editorperformancetests_-_6000_5_-_ubuntu:
247247
flavor: b1.large
248248
commands:
249249
- command: git clone --branch "2.3.0-preview" git@github.cds.internal.unity3d.com:unity/com.unity.package-manager-doctools.git Packages/com.unity.package-manager-doctools
250-
- command: unity-downloader-cli -u trunk -c Editor --fast --wait
250+
- command: unity-downloader-cli -u 6000.5/staging -c Editor --fast --wait
251251
- command: UnifiedTestRunner --testproject=. --editor-location=.Editor --suite=Editor --suite=Playmode --category=Performance --clean-library --api-profile=NET_4_6 --reruncount=1 --clean-library-on-rerun --report-performance-data --performance-project-id=InputSystem --timeout=3600 --artifacts-path=artifacts
252252
after:
253253
- command: bash .yamato/generated-scripts/infrastructure-instability-detection-linux.sh
@@ -266,6 +266,61 @@ inputsystem-editorperformancetests_-_6000_5_-_windows:
266266
commands:
267267
- command: '%GSUDO% choco install netfx-4.7.1-devpack -y --ignore-detected-reboot --ignore-package-codes'
268268
- command: git clone --branch "2.3.0-preview" git@github.cds.internal.unity3d.com:unity/com.unity.package-manager-doctools.git Packages/com.unity.package-manager-doctools
269+
- command: unity-downloader-cli -u 6000.5/staging -c Editor --fast --wait
270+
- command: UnifiedTestRunner.exe --testproject=. --editor-location=.Editor --suite=Editor --suite=Playmode --category=Performance --clean-library --api-profile=NET_4_6 --reruncount=1 --clean-library-on-rerun --report-performance-data --performance-project-id=InputSystem --timeout=3600 --artifacts-path=artifacts
271+
after:
272+
- command: .yamato\generated-scripts\infrastructure-instability-detection-win.cmd
273+
artifacts:
274+
artifacts:
275+
paths:
276+
- artifacts/**/*
277+
278+
# InputSystem-EditorPerformanceTests - 6000.6 - MacOS
279+
inputsystem-editorperformancetests_-_6000_6_-_macos:
280+
name: InputSystem-EditorPerformanceTests - 6000.6 - MacOS
281+
agent:
282+
image: package-ci/macos-13:default
283+
type: Unity::VM::osx
284+
flavor: b1.xlarge
285+
commands:
286+
- command: git clone --branch "2.3.0-preview" git@github.cds.internal.unity3d.com:unity/com.unity.package-manager-doctools.git Packages/com.unity.package-manager-doctools
287+
- command: unity-downloader-cli -u trunk -c Editor --fast --wait
288+
- command: UnifiedTestRunner --testproject=. --editor-location=.Editor --suite=Editor --suite=Playmode --category=Performance --clean-library --api-profile=NET_4_6 --reruncount=1 --clean-library-on-rerun --report-performance-data --performance-project-id=InputSystem --timeout=3600 --artifacts-path=artifacts
289+
after:
290+
- command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh
291+
artifacts:
292+
artifacts:
293+
paths:
294+
- artifacts/**/*
295+
296+
# InputSystem-EditorPerformanceTests - 6000.6 - Ubuntu
297+
inputsystem-editorperformancetests_-_6000_6_-_ubuntu:
298+
name: InputSystem-EditorPerformanceTests - 6000.6 - Ubuntu
299+
agent:
300+
image: package-ci/ubuntu-22.04:default
301+
type: Unity::VM
302+
flavor: b1.large
303+
commands:
304+
- command: git clone --branch "2.3.0-preview" git@github.cds.internal.unity3d.com:unity/com.unity.package-manager-doctools.git Packages/com.unity.package-manager-doctools
305+
- command: unity-downloader-cli -u trunk -c Editor --fast --wait
306+
- command: UnifiedTestRunner --testproject=. --editor-location=.Editor --suite=Editor --suite=Playmode --category=Performance --clean-library --api-profile=NET_4_6 --reruncount=1 --clean-library-on-rerun --report-performance-data --performance-project-id=InputSystem --timeout=3600 --artifacts-path=artifacts
307+
after:
308+
- command: bash .yamato/generated-scripts/infrastructure-instability-detection-linux.sh
309+
artifacts:
310+
artifacts:
311+
paths:
312+
- artifacts/**/*
313+
314+
# InputSystem-EditorPerformanceTests - 6000.6 - Windows
315+
inputsystem-editorperformancetests_-_6000_6_-_windows:
316+
name: InputSystem-EditorPerformanceTests - 6000.6 - Windows
317+
agent:
318+
image: package-ci/win10:default
319+
type: Unity::VM
320+
flavor: b1.large
321+
commands:
322+
- command: '%GSUDO% choco install netfx-4.7.1-devpack -y --ignore-detected-reboot --ignore-package-codes'
323+
- command: git clone --branch "2.3.0-preview" git@github.cds.internal.unity3d.com:unity/com.unity.package-manager-doctools.git Packages/com.unity.package-manager-doctools
269324
- command: unity-downloader-cli -u trunk -c Editor --fast --wait
270325
- command: UnifiedTestRunner.exe --testproject=. --editor-location=.Editor --suite=Editor --suite=Playmode --category=Performance --clean-library --api-profile=NET_4_6 --reruncount=1 --clean-library-on-rerun --report-performance-data --performance-project-id=InputSystem --timeout=3600 --artifacts-path=artifacts
271326
after:

‎.yamato/input-system-mobile-functional-build-jobs.yml‎

Lines changed: 93 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,7 @@ inputsystem-mobilefunctionalbuildjobs_-_6000_5_-_android_-_il2cpp:
366366
type: Unity::VM
367367
flavor: b1.xlarge
368368
commands:
369-
- command: unity-downloader-cli -u trunk -c Editor -c Android --fast --wait
369+
- command: unity-downloader-cli -u 6000.5/staging -c Editor -c Android --fast --wait
370370
- command: |-
371371
set ANDROID_DEVICE_CONNECTION=%BOKKEN_DEVICE_IP%
372372
UnifiedTestRunner --testproject=. --editor-location=.Editor --suite=playmode --category=!Performance --clean-library --reruncount=1 --clean-library-on-rerun --build-only --player-save-path=build/players --timeout=3600 --artifacts-path=build/logs --platform=android --scripting-backend=il2cpp
@@ -388,7 +388,7 @@ inputsystem-mobilefunctionalbuildjobs_-_6000_5_-_android_-_mono:
388388
type: Unity::VM
389389
flavor: b1.xlarge
390390
commands:
391-
- command: unity-downloader-cli -u trunk -c Editor -c Android --fast --wait
391+
- command: unity-downloader-cli -u 6000.5/staging -c Editor -c Android --fast --wait
392392
- command: |-
393393
set ANDROID_DEVICE_CONNECTION=%BOKKEN_DEVICE_IP%
394394
UnifiedTestRunner --testproject=. --editor-location=.Editor --suite=playmode --category=!Performance --clean-library --reruncount=1 --clean-library-on-rerun --build-only --player-save-path=build/players --timeout=3600 --artifacts-path=build/logs --platform=android
@@ -410,7 +410,7 @@ inputsystem-mobilefunctionalbuildjobs_-_6000_5_-_ios:
410410
type: Unity::VM::osx
411411
flavor: m1.mac
412412
commands:
413-
- command: unity-downloader-cli -u trunk -c Editor -c iOS --fast --wait
413+
- command: unity-downloader-cli -u 6000.5/staging -c Editor -c iOS --fast --wait
414414
- command: |-
415415
curl -s https://artifactory-slo.bf.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr
416416
chmod u+x utr
@@ -436,6 +436,96 @@ inputsystem-mobilefunctionalbuildjobs_-_6000_5_-_tvos:
436436
type: Unity::VM::osx
437437
flavor: m1.mac
438438
commands:
439+
- command: unity-downloader-cli -u 6000.5/staging -c Editor -c AppleTV --fast --wait
440+
- command: UnifiedTestRunner --testproject=. --editor-location=.Editor --suite=playmode --category=!Performance --clean-library --reruncount=1 --clean-library-on-rerun --build-only --player-save-path=build/players --timeout=3600 --artifacts-path=build/logs --platform=tvOS
441+
after:
442+
- command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh
443+
artifacts:
444+
logs:
445+
paths:
446+
- build/logs/**/*
447+
players:
448+
paths:
449+
- build/players/**/*
450+
451+
# InputSystem-MobileFunctionalBuildJobs - 6000.6 - Android - il2cpp
452+
inputsystem-mobilefunctionalbuildjobs_-_6000_6_-_android_-_il2cpp:
453+
name: InputSystem-MobileFunctionalBuildJobs - 6000.6 - Android - il2cpp
454+
agent:
455+
image: package-ci/win10:default
456+
type: Unity::VM
457+
flavor: b1.xlarge
458+
commands:
459+
- command: unity-downloader-cli -u trunk -c Editor -c Android --fast --wait
460+
- command: |-
461+
set ANDROID_DEVICE_CONNECTION=%BOKKEN_DEVICE_IP%
462+
UnifiedTestRunner --testproject=. --editor-location=.Editor --suite=playmode --category=!Performance --clean-library --reruncount=1 --clean-library-on-rerun --build-only --player-save-path=build/players --timeout=3600 --artifacts-path=build/logs --platform=android --scripting-backend=il2cpp
463+
after:
464+
- command: .yamato\generated-scripts\infrastructure-instability-detection-win.cmd
465+
artifacts:
466+
logs:
467+
paths:
468+
- build/logs/**/*
469+
players:
470+
paths:
471+
- build/players/**/*
472+
473+
# InputSystem-MobileFunctionalBuildJobs - 6000.6 - Android - mono
474+
inputsystem-mobilefunctionalbuildjobs_-_6000_6_-_android_-_mono:
475+
name: InputSystem-MobileFunctionalBuildJobs - 6000.6 - Android - mono
476+
agent:
477+
image: package-ci/win10:default
478+
type: Unity::VM
479+
flavor: b1.xlarge
480+
commands:
481+
- command: unity-downloader-cli -u trunk -c Editor -c Android --fast --wait
482+
- command: |-
483+
set ANDROID_DEVICE_CONNECTION=%BOKKEN_DEVICE_IP%
484+
UnifiedTestRunner --testproject=. --editor-location=.Editor --suite=playmode --category=!Performance --clean-library --reruncount=1 --clean-library-on-rerun --build-only --player-save-path=build/players --timeout=3600 --artifacts-path=build/logs --platform=android
485+
after:
486+
- command: .yamato\generated-scripts\infrastructure-instability-detection-win.cmd
487+
artifacts:
488+
logs:
489+
paths:
490+
- build/logs/**/*
491+
players:
492+
paths:
493+
- build/players/**/*
494+
495+
# InputSystem-MobileFunctionalBuildJobs - 6000.6 - IOS
496+
inputsystem-mobilefunctionalbuildjobs_-_6000_6_-_ios:
497+
name: InputSystem-MobileFunctionalBuildJobs - 6000.6 - IOS
498+
agent:
499+
image: package-ci/macos-13:default
500+
type: Unity::VM::osx
501+
flavor: m1.mac
502+
commands:
503+
- command: unity-downloader-cli -u trunk -c Editor -c iOS --fast --wait
504+
- command: |-
505+
curl -s https://artifactory-slo.bf.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr
506+
chmod u+x utr
507+
- command: ./utr --testproject=. --editor-location=.Editor --suite=playmode --category=!Performance --clean-library --reruncount=1 --clean-library-on-rerun --build-only --player-save-path=build/players --timeout=3600 --artifacts-path=build/logs --platform=ios
508+
after:
509+
- command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh
510+
artifacts:
511+
logs:
512+
paths:
513+
- build/logs/**/*
514+
players:
515+
paths:
516+
- build/players/**/*
517+
variables:
518+
UNITY_HANDLEUIINTERRUPTIONS: 1
519+
UTR_VERSION: 1.42.0
520+
521+
# InputSystem-MobileFunctionalBuildJobs - 6000.6 - TvOS
522+
inputsystem-mobilefunctionalbuildjobs_-_6000_6_-_tvos:
523+
name: InputSystem-MobileFunctionalBuildJobs - 6000.6 - TvOS
524+
agent:
525+
image: package-ci/macos-13:default
526+
type: Unity::VM::osx
527+
flavor: m1.mac
528+
commands:
439529
- command: unity-downloader-cli -u trunk -c Editor -c AppleTV --fast --wait
440530
- command: UnifiedTestRunner --testproject=. --editor-location=.Editor --suite=playmode --category=!Performance --clean-library --reruncount=1 --clean-library-on-rerun --build-only --player-save-path=build/players --timeout=3600 --artifacts-path=build/logs --platform=tvOS
441531
after:

0 commit comments

Comments
 (0)