Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions .yamato/input-system-mobile-functional-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ inputsystem-mobilefunctionaltests_-_2022_3_-_android_-_il2cpp:
- build/test-results/**/*
dependencies:
- path: .yamato/input-system-mobile-functional-build-jobs.yml#inputsystem-mobilefunctionalbuildjobs_-_2022_3_-_android_-_il2cpp
variables:
UTR_VERSION: 1.42.0

# InputSystem-MobileFunctionalTests - 2022.3 - Android - mono
inputsystem-mobilefunctionaltests_-_2022_3_-_android_-_mono:
Expand All @@ -51,6 +53,8 @@ inputsystem-mobilefunctionaltests_-_2022_3_-_android_-_mono:
- build/test-results/**/*
dependencies:
- path: .yamato/input-system-mobile-functional-build-jobs.yml#inputsystem-mobilefunctionalbuildjobs_-_2022_3_-_android_-_mono
variables:
UTR_VERSION: 1.42.0

# InputSystem-MobileFunctionalTests - 2022.3 - IOS
inputsystem-mobilefunctionaltests_-_2022_3_-_ios:
Expand Down Expand Up @@ -119,6 +123,8 @@ inputsystem-mobilefunctionaltests_-_6000_0_-_android_-_il2cpp:
- build/test-results/**/*
dependencies:
- path: .yamato/input-system-mobile-functional-build-jobs.yml#inputsystem-mobilefunctionalbuildjobs_-_6000_0_-_android_-_il2cpp
variables:
UTR_VERSION: 1.42.0

# InputSystem-MobileFunctionalTests - 6000.0 - Android - mono
inputsystem-mobilefunctionaltests_-_6000_0_-_android_-_mono:
Expand All @@ -145,6 +151,8 @@ inputsystem-mobilefunctionaltests_-_6000_0_-_android_-_mono:
- build/test-results/**/*
dependencies:
- path: .yamato/input-system-mobile-functional-build-jobs.yml#inputsystem-mobilefunctionalbuildjobs_-_6000_0_-_android_-_mono
variables:
UTR_VERSION: 1.42.0

# InputSystem-MobileFunctionalTests - 6000.0 - IOS
inputsystem-mobilefunctionaltests_-_6000_0_-_ios:
Expand Down Expand Up @@ -213,6 +221,8 @@ inputsystem-mobilefunctionaltests_-_6000_2_-_android_-_il2cpp:
- build/test-results/**/*
dependencies:
- path: .yamato/input-system-mobile-functional-build-jobs.yml#inputsystem-mobilefunctionalbuildjobs_-_6000_2_-_android_-_il2cpp
variables:
UTR_VERSION: 1.42.0

# InputSystem-MobileFunctionalTests - 6000.2 - Android - mono
inputsystem-mobilefunctionaltests_-_6000_2_-_android_-_mono:
Expand All @@ -239,6 +249,8 @@ inputsystem-mobilefunctionaltests_-_6000_2_-_android_-_mono:
- build/test-results/**/*
dependencies:
- path: .yamato/input-system-mobile-functional-build-jobs.yml#inputsystem-mobilefunctionalbuildjobs_-_6000_2_-_android_-_mono
variables:
UTR_VERSION: 1.42.0

# InputSystem-MobileFunctionalTests - 6000.2 - IOS
inputsystem-mobilefunctionaltests_-_6000_2_-_ios:
Expand Down Expand Up @@ -307,6 +319,8 @@ inputsystem-mobilefunctionaltests_-_6000_3_-_android_-_il2cpp:
- build/test-results/**/*
dependencies:
- path: .yamato/input-system-mobile-functional-build-jobs.yml#inputsystem-mobilefunctionalbuildjobs_-_6000_3_-_android_-_il2cpp
variables:
UTR_VERSION: 1.42.0

# InputSystem-MobileFunctionalTests - 6000.3 - Android - mono
inputsystem-mobilefunctionaltests_-_6000_3_-_android_-_mono:
Expand All @@ -333,6 +347,8 @@ inputsystem-mobilefunctionaltests_-_6000_3_-_android_-_mono:
- build/test-results/**/*
dependencies:
- path: .yamato/input-system-mobile-functional-build-jobs.yml#inputsystem-mobilefunctionalbuildjobs_-_6000_3_-_android_-_mono
variables:
UTR_VERSION: 1.42.0

# InputSystem-MobileFunctionalTests - 6000.3 - IOS
inputsystem-mobilefunctionaltests_-_6000_3_-_ios:
Expand Down Expand Up @@ -401,6 +417,8 @@ inputsystem-mobilefunctionaltests_-_6000_4_-_android_-_il2cpp:
- build/test-results/**/*
dependencies:
- path: .yamato/input-system-mobile-functional-build-jobs.yml#inputsystem-mobilefunctionalbuildjobs_-_6000_4_-_android_-_il2cpp
variables:
UTR_VERSION: 1.42.0

# InputSystem-MobileFunctionalTests - 6000.4 - Android - mono
inputsystem-mobilefunctionaltests_-_6000_4_-_android_-_mono:
Expand All @@ -427,6 +445,8 @@ inputsystem-mobilefunctionaltests_-_6000_4_-_android_-_mono:
- build/test-results/**/*
dependencies:
- path: .yamato/input-system-mobile-functional-build-jobs.yml#inputsystem-mobilefunctionalbuildjobs_-_6000_4_-_android_-_mono
variables:
UTR_VERSION: 1.42.0

# InputSystem-MobileFunctionalTests - 6000.4 - IOS
inputsystem-mobilefunctionaltests_-_6000_4_-_ios:
Expand Down Expand Up @@ -495,6 +515,8 @@ inputsystem-mobilefunctionaltests_-_6000_5_-_android_-_il2cpp:
- build/test-results/**/*
dependencies:
- path: .yamato/input-system-mobile-functional-build-jobs.yml#inputsystem-mobilefunctionalbuildjobs_-_6000_5_-_android_-_il2cpp
variables:
UTR_VERSION: 1.42.0

# InputSystem-MobileFunctionalTests - 6000.5 - Android - mono
inputsystem-mobilefunctionaltests_-_6000_5_-_android_-_mono:
Expand All @@ -521,6 +543,8 @@ inputsystem-mobilefunctionaltests_-_6000_5_-_android_-_mono:
- build/test-results/**/*
dependencies:
- path: .yamato/input-system-mobile-functional-build-jobs.yml#inputsystem-mobilefunctionalbuildjobs_-_6000_5_-_android_-_mono
variables:
UTR_VERSION: 1.42.0

# InputSystem-MobileFunctionalTests - 6000.5 - IOS
inputsystem-mobilefunctionaltests_-_6000_5_-_ios:
Expand Down
24 changes: 24 additions & 0 deletions .yamato/input-system-mobile-performance-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ inputsystem-mobileperformancetests_-_2022_3_-_android_-_il2cpp:
- build/test-results/**/*
dependencies:
- path: .yamato/input-system-mobile-performance-build-jobs.yml#inputsystem-mobileperformancebuildjobs_-_2022_3_-_android_-_il2cpp
variables:
UTR_VERSION: 1.42.0

# InputSystem-MobilePerformanceTests - 2022.3 - Android - mono
inputsystem-mobileperformancetests_-_2022_3_-_android_-_mono:
Expand All @@ -51,6 +53,8 @@ inputsystem-mobileperformancetests_-_2022_3_-_android_-_mono:
- build/test-results/**/*
dependencies:
- path: .yamato/input-system-mobile-performance-build-jobs.yml#inputsystem-mobileperformancebuildjobs_-_2022_3_-_android_-_mono
variables:
UTR_VERSION: 1.42.0

# InputSystem-MobilePerformanceTests - 2022.3 - IOS
inputsystem-mobileperformancetests_-_2022_3_-_ios:
Expand Down Expand Up @@ -119,6 +123,8 @@ inputsystem-mobileperformancetests_-_6000_0_-_android_-_il2cpp:
- build/test-results/**/*
dependencies:
- path: .yamato/input-system-mobile-performance-build-jobs.yml#inputsystem-mobileperformancebuildjobs_-_6000_0_-_android_-_il2cpp
variables:
UTR_VERSION: 1.42.0

# InputSystem-MobilePerformanceTests - 6000.0 - Android - mono
inputsystem-mobileperformancetests_-_6000_0_-_android_-_mono:
Expand All @@ -145,6 +151,8 @@ inputsystem-mobileperformancetests_-_6000_0_-_android_-_mono:
- build/test-results/**/*
dependencies:
- path: .yamato/input-system-mobile-performance-build-jobs.yml#inputsystem-mobileperformancebuildjobs_-_6000_0_-_android_-_mono
variables:
UTR_VERSION: 1.42.0

# InputSystem-MobilePerformanceTests - 6000.0 - IOS
inputsystem-mobileperformancetests_-_6000_0_-_ios:
Expand Down Expand Up @@ -213,6 +221,8 @@ inputsystem-mobileperformancetests_-_6000_2_-_android_-_il2cpp:
- build/test-results/**/*
dependencies:
- path: .yamato/input-system-mobile-performance-build-jobs.yml#inputsystem-mobileperformancebuildjobs_-_6000_2_-_android_-_il2cpp
variables:
UTR_VERSION: 1.42.0

# InputSystem-MobilePerformanceTests - 6000.2 - Android - mono
inputsystem-mobileperformancetests_-_6000_2_-_android_-_mono:
Expand All @@ -239,6 +249,8 @@ inputsystem-mobileperformancetests_-_6000_2_-_android_-_mono:
- build/test-results/**/*
dependencies:
- path: .yamato/input-system-mobile-performance-build-jobs.yml#inputsystem-mobileperformancebuildjobs_-_6000_2_-_android_-_mono
variables:
UTR_VERSION: 1.42.0

# InputSystem-MobilePerformanceTests - 6000.2 - IOS
inputsystem-mobileperformancetests_-_6000_2_-_ios:
Expand Down Expand Up @@ -307,6 +319,8 @@ inputsystem-mobileperformancetests_-_6000_3_-_android_-_il2cpp:
- build/test-results/**/*
dependencies:
- path: .yamato/input-system-mobile-performance-build-jobs.yml#inputsystem-mobileperformancebuildjobs_-_6000_3_-_android_-_il2cpp
variables:
UTR_VERSION: 1.42.0

# InputSystem-MobilePerformanceTests - 6000.3 - Android - mono
inputsystem-mobileperformancetests_-_6000_3_-_android_-_mono:
Expand All @@ -333,6 +347,8 @@ inputsystem-mobileperformancetests_-_6000_3_-_android_-_mono:
- build/test-results/**/*
dependencies:
- path: .yamato/input-system-mobile-performance-build-jobs.yml#inputsystem-mobileperformancebuildjobs_-_6000_3_-_android_-_mono
variables:
UTR_VERSION: 1.42.0

# InputSystem-MobilePerformanceTests - 6000.3 - IOS
inputsystem-mobileperformancetests_-_6000_3_-_ios:
Expand Down Expand Up @@ -401,6 +417,8 @@ inputsystem-mobileperformancetests_-_6000_4_-_android_-_il2cpp:
- build/test-results/**/*
dependencies:
- path: .yamato/input-system-mobile-performance-build-jobs.yml#inputsystem-mobileperformancebuildjobs_-_6000_4_-_android_-_il2cpp
variables:
UTR_VERSION: 1.42.0

# InputSystem-MobilePerformanceTests - 6000.4 - Android - mono
inputsystem-mobileperformancetests_-_6000_4_-_android_-_mono:
Expand All @@ -427,6 +445,8 @@ inputsystem-mobileperformancetests_-_6000_4_-_android_-_mono:
- build/test-results/**/*
dependencies:
- path: .yamato/input-system-mobile-performance-build-jobs.yml#inputsystem-mobileperformancebuildjobs_-_6000_4_-_android_-_mono
variables:
UTR_VERSION: 1.42.0

# InputSystem-MobilePerformanceTests - 6000.4 - IOS
inputsystem-mobileperformancetests_-_6000_4_-_ios:
Expand Down Expand Up @@ -495,6 +515,8 @@ inputsystem-mobileperformancetests_-_6000_5_-_android_-_il2cpp:
- build/test-results/**/*
dependencies:
- path: .yamato/input-system-mobile-performance-build-jobs.yml#inputsystem-mobileperformancebuildjobs_-_6000_5_-_android_-_il2cpp
variables:
UTR_VERSION: 1.42.0

# InputSystem-MobilePerformanceTests - 6000.5 - Android - mono
inputsystem-mobileperformancetests_-_6000_5_-_android_-_mono:
Expand All @@ -521,6 +543,8 @@ inputsystem-mobileperformancetests_-_6000_5_-_android_-_mono:
- build/test-results/**/*
dependencies:
- path: .yamato/input-system-mobile-performance-build-jobs.yml#inputsystem-mobileperformancebuildjobs_-_6000_5_-_android_-_mono
variables:
UTR_VERSION: 1.42.0

# InputSystem-MobilePerformanceTests - 6000.5 - IOS
inputsystem-mobileperformancetests_-_6000_5_-_ios:
Expand Down
7 changes: 5 additions & 2 deletions Tools/CI/Recipes/MobileBaseRecipe.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

namespace InputSystem.Cookbook.Recipes;

public abstract class MobileBaseRecipe: BaseRecipe
public abstract class MobileBaseRecipe : BaseRecipe
{
public override IEnumerable<IJobBuilder> GetJobs()
{
Expand Down Expand Up @@ -57,6 +57,9 @@ protected string PrepareUtrExecutable(IJobBuilder job, SystemType systemType)
break;
job.WithCommands(Settings.AndroidExtraCommands).WithAfterCommands(Settings.AndroidExtraAfterCommands);
job.WithCommands(UtrCommand.Download(systemType, "utr.bat"));
// Yet another temporary fix. UTR 1.43.0 was failing on Android builds due to some internal issue so
// we are forcing UTR version 1.42.0 for Android platform.
job.WithEnvironmentVariable("UTR_VERSION", "1.42.0");
return "utr.bat";
case SystemType.IOS:
job.WithCommands(UtrCommand.Download(systemType, "utr"));
Expand All @@ -68,4 +71,4 @@ protected string PrepareUtrExecutable(IJobBuilder job, SystemType systemType)

return "UnifiedTestRunner";
}
}
}